Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-omap-h63xx.git] / drivers / leds / leds-corgi.c

diff --git a/drivers/leds/leds-corgi.c b/drivers/leds/leds-corgi.c
index 29e931f89f9cce65f25f422c87680b6347ad6b92..bc2dcd89f63545478fb28093ed3ae739cc931b03 100644 (file)
--- a/drivers/leds/leds-corgi.c
+++ b/drivers/leds/leds-corgi.c
@@ -15,13 +15,13 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
-#include <asm/mach-types.h>
-#include <asm/arch/corgi.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/corgi.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
 #include <asm/hardware/scoop.h>
 
-static void corgiled_amber_set(struct led_classdev *led_cdev, enum led_brightness value)
+static void corgiled_amber_set(struct led_classdev *led_cdev,
+                              enum led_brightness value)
 {
        if (value)
                GPSR0 = GPIO_bit(CORGI_GPIO_LED_ORANGE);
@@ -29,7 +29,8 @@ static void corgiled_amber_set(struct led_classdev *led_cdev, enum led_brightnes
                GPCR0 = GPIO_bit(CORGI_GPIO_LED_ORANGE);
 }
 
-static void corgiled_green_set(struct led_classdev *led_cdev, enum led_brightness value)
+static void corgiled_green_set(struct led_classdev *led_cdev,
+                              enum led_brightness value)
 {
        if (value)
                set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_LED_GREEN);
@@ -53,7 +54,8 @@ static struct led_classdev corgi_green_led = {
 static int corgiled_suspend(struct platform_device *dev, pm_message_t state)
 {
 #ifdef CONFIG_LEDS_TRIGGERS
-       if (corgi_amber_led.trigger && strcmp(corgi_amber_led.trigger->name, "sharpsl-charge"))
+       if (corgi_amber_led.trigger &&
+           strcmp(corgi_amber_led.trigger->name, "sharpsl-charge"))
 #endif
                led_classdev_suspend(&corgi_amber_led);
        led_classdev_suspend(&corgi_green_led);
@@ -110,7 +112,7 @@ static int __init corgiled_init(void)
 
 static void __exit corgiled_exit(void)
 {
-       platform_driver_unregister(&corgiled_driver);
+       platform_driver_unregister(&corgiled_driver);
 }
 
 module_init(corgiled_init);