diff --git a/[refs] b/[refs]
index 8987177c5423..a5e20a8ba532 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b59b6beb423267e8fe2ef3596d98aba0b910341
+refs/heads/master: 6f3e14163e066a6f43a54098a12185f25400fd68
diff --git a/trunk/arch/arm/mach-omap/leds-h2p2-debug.c b/trunk/arch/arm/mach-omap1/leds-h2p2-debug.c
similarity index 100%
rename from trunk/arch/arm/mach-omap/leds-h2p2-debug.c
rename to trunk/arch/arm/mach-omap1/leds-h2p2-debug.c
diff --git a/trunk/arch/arm/mach-omap/leds-innovator.c b/trunk/arch/arm/mach-omap1/leds-innovator.c
similarity index 100%
rename from trunk/arch/arm/mach-omap/leds-innovator.c
rename to trunk/arch/arm/mach-omap1/leds-innovator.c
diff --git a/trunk/arch/arm/mach-omap/leds-osk.c b/trunk/arch/arm/mach-omap1/leds-osk.c
similarity index 98%
rename from trunk/arch/arm/mach-omap/leds-osk.c
rename to trunk/arch/arm/mach-omap1/leds-osk.c
index f5177f430793..4a0e8b9d4fc3 100644
--- a/trunk/arch/arm/mach-omap/leds-osk.c
+++ b/trunk/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/trunk/arch/arm/mach-omap/leds.c b/trunk/arch/arm/mach-omap1/leds.c
similarity index 100%
rename from trunk/arch/arm/mach-omap/leds.c
rename to trunk/arch/arm/mach-omap1/leds.c
diff --git a/trunk/arch/arm/mach-omap/leds.h b/trunk/arch/arm/mach-omap1/leds.h
similarity index 100%
rename from trunk/arch/arm/mach-omap/leds.h
rename to trunk/arch/arm/mach-omap1/leds.h