Merge branch 'linus' into x86/cpu

[linux-2.6-omap-h63xx.git] / arch / arm / mach-pxa / leds-mainstone.c

diff --git a/arch/arm/mach-pxa/leds-mainstone.c b/arch/arm/mach-pxa/leds-mainstone.c
index bbd3f87a9fc2222e176e4fddd4e61080b965086e..95e06b8496346a26df86e11462063c9c44c4637e 100644 (file)
--- a/arch/arm/mach-pxa/leds-mainstone.c
+++ b/arch/arm/mach-pxa/leds-mainstone.c
@@ -10,15 +10,14 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/config.h>
 #include <linux/init.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/system.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/mainstone.h>
+#include <mach/pxa-regs.h>
+#include <mach/mainstone.h>
 
 #include "leds.h"
 
@@ -85,7 +84,7 @@ void mainstone_leds_event(led_event_t evt)
                break;
 
        case led_green_on:
-               hw_led_state |= D21;;
+               hw_led_state |= D21;
                break;
 
        case led_green_off:
@@ -93,7 +92,7 @@ void mainstone_leds_event(led_event_t evt)
                break;
 
        case led_amber_on:
-               hw_led_state |= D22;;
+               hw_led_state |= D22;
                break;
 
        case led_amber_off:
@@ -101,7 +100,7 @@ void mainstone_leds_event(led_event_t evt)
                break;
 
        case led_red_on:
-               hw_led_state |= D23;;
+               hw_led_state |= D23;
                break;
 
        case led_red_off: