Merge commit 'v2.6.27-rc8' into genirq

[linux-2.6-omap-h63xx.git] / arch / arm / mach-footbridge / ebsa285-leds.c

diff --git a/arch/arm/mach-footbridge/ebsa285-leds.c b/arch/arm/mach-footbridge/ebsa285-leds.c
index 2c7c3630401bd2968544653331380dd719ab29a0..4e10090cd87fb107cb82ab629826b5e420c7aa53 100644 (file)
--- a/arch/arm/mach-footbridge/ebsa285-leds.c
+++ b/arch/arm/mach-footbridge/ebsa285-leds.c
@@ -16,13 +16,12 @@
  * Changelog:
  *   02-05-1999        RMK     Various cleanups
  */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/mach-types.h>
 #include <asm/system.h>
@@ -129,7 +128,7 @@ static void ebsa285_leds_event(led_event_t evt)
 
 static int __init leds_init(void)
 {
-       if (machine_is_ebsa285() || machine_is_co285())
+       if (machine_is_ebsa285())
                leds_event = ebsa285_leds_event;
 
        leds_event(led_start);