diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
| commit | 0b9b01517f0b1398ec27dbb47faf3645b719e02c (patch) | |
| tree | fac11441ba4056e75d3b59811da3b0a91d1cfcf5 /lib/time.c | |
| parent | 8bd3c0a7e17ee17c771cabc0e548a1a436ac021d (diff) | |
| parent | 6333acb961b6fcaa60c6e5b623d676b332481cfa (diff) | |
Merge branch '2023-01-20-finish-CONFIG-migration-work'
- Merge in the final batch of CONFIG to Kconfig/CFG migration work. This
includes a fix for a number of ns16550 or similar UARTs due to a
migration bug. We also pull in a revert for enabling CONFIG_VIDEO on
tools-only_defconfig.
Diffstat (limited to 'lib/time.c')
| -rw-r--r-- | lib/time.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/time.c b/lib/time.c index 0c95d12f61..5252190af5 100644 --- a/lib/time.c +++ b/lib/time.c @@ -19,8 +19,8 @@ #include <asm/io.h> #include <linux/delay.h> -#ifndef CONFIG_WD_PERIOD -# define CONFIG_WD_PERIOD (10 * 1000 * 1000) /* 10 seconds default */ +#ifndef CFG_WD_PERIOD +# define CFG_WD_PERIOD (10 * 1000 * 1000) /* 10 seconds default */ #endif DECLARE_GLOBAL_DATA_PTR; @@ -199,7 +199,7 @@ void udelay(unsigned long usec) do { schedule(); - kv = usec > CONFIG_WD_PERIOD ? CONFIG_WD_PERIOD : usec; + kv = usec > CFG_WD_PERIOD ? CFG_WD_PERIOD : usec; __udelay(kv); usec -= kv; } while(usec); |