diff options
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/include/asm/status_led.h | 10 | ||||
-rw-r--r-- | arch/powerpc/lib/interrupts.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/powerpc/include/asm/status_led.h b/arch/powerpc/include/asm/status_led.h index 260a831..1ae1b17 100644 --- a/arch/powerpc/include/asm/status_led.h +++ b/arch/powerpc/include/asm/status_led.h @@ -8,7 +8,7 @@ #define __ASM_STATUS_LED_H__ /* if not overridden */ -#ifndef CONFIG_BOARD_SPECIFIC_LED +#ifndef CONFIG_LED_STATUS_BOARD_SPECIFIC # if defined(CONFIG_8xx) # include <mpc8xx.h> # elif defined(CONFIG_MPC8260) @@ -34,12 +34,12 @@ static inline void __led_init (led_id_t mask, int state) #endif #if (STATUS_LED_ACTIVE == 0) - if (state == STATUS_LED_ON) + if (state == CONFIG_LED_STATUS_ON) immr->STATUS_LED_DAT &= ~mask; else immr->STATUS_LED_DAT |= mask; #else - if (state == STATUS_LED_ON) + if (state == CONFIG_LED_STATUS_ON) immr->STATUS_LED_DAT |= mask; else immr->STATUS_LED_DAT &= ~mask; @@ -59,12 +59,12 @@ static inline void __led_set (led_id_t mask, int state) volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR; #if (STATUS_LED_ACTIVE == 0) - if (state == STATUS_LED_ON) + if (state == CONFIG_LED_STATUS_ON) immr->STATUS_LED_DAT &= ~mask; else immr->STATUS_LED_DAT |= mask; #else - if (state == STATUS_LED_ON) + if (state == CONFIG_LED_STATUS_ON) immr->STATUS_LED_DAT |= mask; else immr->STATUS_LED_DAT &= ~mask; diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c index f7cf915..5031357 100644 --- a/arch/powerpc/lib/interrupts.c +++ b/arch/powerpc/lib/interrupts.c @@ -11,7 +11,7 @@ #include <common.h> #include <asm/processor.h> #include <watchdog.h> -#ifdef CONFIG_STATUS_LED +#ifdef CONFIG_LED_STATUS #include <status_led.h> #endif @@ -112,9 +112,9 @@ void timer_interrupt (struct pt_regs *regs) WATCHDOG_RESET (); #endif /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */ -#ifdef CONFIG_STATUS_LED +#ifdef CONFIG_LED_STATUS status_led_tick (timestamp); -#endif /* CONFIG_STATUS_LED */ +#endif /* CONFIG_LED_STATUS */ #ifdef CONFIG_SHOW_ACTIVITY board_show_activity (timestamp); |