[PATCH] ARM: 2799/1: OMAP update 4/11: Move OMAP1 LED code into mach-omap1 directory

Patch from Tony Lindgren

This patch by Paul Mundt and other OMAP developers
moves OMAP1 specific LED code into mach-omap1 directory.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-omap/leds-h2p2-debug.c b/arch/arm/mach-omap1/leds-h2p2-debug.c
similarity index 100%
rename from arch/arm/mach-omap/leds-h2p2-debug.c
rename to arch/arm/mach-omap1/leds-h2p2-debug.c

diff --git a/arch/arm/mach-omap/leds-innovator.c b/arch/arm/mach-omap1/leds-innovator.c
similarity index 100%
rename from arch/arm/mach-omap/leds-innovator.c
rename to arch/arm/mach-omap1/leds-innovator.c

diff --git a/arch/arm/mach-omap/leds-osk.c b/arch/arm/mach-omap1/leds-osk.c
similarity index 98%
rename from arch/arm/mach-omap/leds-osk.c
rename to arch/arm/mach-omap1/leds-osk.c
index f5177f430793b6e2cd22bbcc2348855f3df297f5..4a0e8b9d4fc37d5748e067c01ff0b84a59d1e1d2 100644 (file)
--- a/arch/arm/mach-omap/leds-osk.c
+++ b/arch/arm/mach-omap1/leds-osk.c
@@ -129,14 +129,11 @@ void osk_leds_event(led_event_t evt)
 
 #ifdef CONFIG_FB_OMAP
 
-#ifdef CONFIG_LEDS_TIMER
        case led_timer:
                hw_led_state ^= TIMER_LED;
                mistral_setled();
                break;
-#endif
 
-#ifdef CONFIG_LEDS_CPU
        case led_idle_start:
                hw_led_state |= IDLE_LED;
                mistral_setled();
@@ -146,7 +143,6 @@ void osk_leds_event(led_event_t evt)
                hw_led_state &= ~IDLE_LED;
                mistral_setled();
                break;
-#endif
 
 #endif /* CONFIG_FB_OMAP */
 

diff --git a/arch/arm/mach-omap/leds.c b/arch/arm/mach-omap1/leds.c
similarity index 100%
rename from arch/arm/mach-omap/leds.c
rename to arch/arm/mach-omap1/leds.c

diff --git a/arch/arm/mach-omap/leds.h b/arch/arm/mach-omap1/leds.h
similarity index 100%
rename from arch/arm/mach-omap/leds.h
rename to arch/arm/mach-omap1/leds.h