diff options
author | Tony Lindgren <tony@atomide.com> | 2005-07-10 14:58:10 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-10 14:58:10 -0400 |
commit | 6f3e14163e066a6f43a54098a12185f25400fd68 (patch) | |
tree | 2c2818bbe759d4867df01dee69edd37540bcc30e | |
parent | 3b59b6beb423267e8fe2ef3596d98aba0b910341 (diff) |
[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>
-rw-r--r-- | arch/arm/mach-omap1/leds-h2p2-debug.c (renamed from arch/arm/mach-omap/leds-h2p2-debug.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-omap1/leds-innovator.c (renamed from arch/arm/mach-omap/leds-innovator.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-omap1/leds-osk.c (renamed from arch/arm/mach-omap/leds-osk.c) | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap1/leds.c (renamed from arch/arm/mach-omap/leds.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-omap1/leds.h (renamed from arch/arm/mach-omap/leds.h) | 0 |
5 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-omap/leds-h2p2-debug.c b/arch/arm/mach-omap1/leds-h2p2-debug.c index 6e98290cca5c..6e98290cca5c 100644 --- a/arch/arm/mach-omap/leds-h2p2-debug.c +++ b/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 index 8043b7d0f66e..8043b7d0f66e 100644 --- a/arch/arm/mach-omap/leds-innovator.c +++ b/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 index f5177f430793..4a0e8b9d4fc3 100644 --- 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) | |||
129 | 129 | ||
130 | #ifdef CONFIG_FB_OMAP | 130 | #ifdef CONFIG_FB_OMAP |
131 | 131 | ||
132 | #ifdef CONFIG_LEDS_TIMER | ||
133 | case led_timer: | 132 | case led_timer: |
134 | hw_led_state ^= TIMER_LED; | 133 | hw_led_state ^= TIMER_LED; |
135 | mistral_setled(); | 134 | mistral_setled(); |
136 | break; | 135 | break; |
137 | #endif | ||
138 | 136 | ||
139 | #ifdef CONFIG_LEDS_CPU | ||
140 | case led_idle_start: | 137 | case led_idle_start: |
141 | hw_led_state |= IDLE_LED; | 138 | hw_led_state |= IDLE_LED; |
142 | mistral_setled(); | 139 | mistral_setled(); |
@@ -146,7 +143,6 @@ void osk_leds_event(led_event_t evt) | |||
146 | hw_led_state &= ~IDLE_LED; | 143 | hw_led_state &= ~IDLE_LED; |
147 | mistral_setled(); | 144 | mistral_setled(); |
148 | break; | 145 | break; |
149 | #endif | ||
150 | 146 | ||
151 | #endif /* CONFIG_FB_OMAP */ | 147 | #endif /* CONFIG_FB_OMAP */ |
152 | 148 | ||
diff --git a/arch/arm/mach-omap/leds.c b/arch/arm/mach-omap1/leds.c index 8ab21fe98e1b..8ab21fe98e1b 100644 --- a/arch/arm/mach-omap/leds.c +++ b/arch/arm/mach-omap1/leds.c | |||
diff --git a/arch/arm/mach-omap/leds.h b/arch/arm/mach-omap1/leds.h index a1e9fedc376c..a1e9fedc376c 100644 --- a/arch/arm/mach-omap/leds.h +++ b/arch/arm/mach-omap1/leds.h | |||