diff options
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/i386/sc520/sc520.c | 6 | ||||
| -rw-r--r-- | cpu/i386/timer.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cpu/i386/sc520/sc520.c b/cpu/i386/sc520/sc520.c index b958f8d..2ac3fd4 100644 --- a/cpu/i386/sc520/sc520.c +++ b/cpu/i386/sc520/sc520.c @@ -28,7 +28,7 @@ #include <common.h> #include <config.h> #include <pci.h> -#ifdef CONFIG_SC520_SSI +#ifdef CONFIG_SYS_SC520_SSI #include <asm/ic/ssi.h> #endif #include <asm/io.h> @@ -390,7 +390,7 @@ void pci_sc520_init(struct pci_controller *hose) #endif -#ifdef CONFIG_SYS_TIMER_SC520 +#ifdef CONFIG_SYS_SC520_TIMER void reset_timer(void) @@ -504,7 +504,7 @@ u8 ssi_rx_byte(void) return read_mmcr_byte(SC520_SSIRCV); } -#ifdef CONFIG_SYS_RESET_SC520 +#ifdef CONFIG_SYS_SC520_RESET void reset_cpu(ulong addr) { printf("Resetting using SC520 MMCR\n"); diff --git a/cpu/i386/timer.c b/cpu/i386/timer.c index 46db23f..79039c2 100644 --- a/cpu/i386/timer.c +++ b/cpu/i386/timer.c @@ -72,7 +72,7 @@ int timer_init(void) } -#ifdef CONFIG_SYS_TIMER_GENERIC +#ifdef CONFIG_SYS_GENERIC_TIMER /* the unit for these is CONFIG_SYS_HZ */ |