diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-03 11:13:28 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-03 11:13:28 -0400 |
| commit | 946e2ad040000a14b7316fae722e7e65fa09ffe5 (patch) | |
| tree | 6bc244a1c49221335e14bf795403debf6f24712d /arch/arm/mach-footbridge/ebsa285-leds.c | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
| parent | e055d5bff318845f99c0fbf93245767fab8dce88 (diff) | |
Merge branch 'fb' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-footbridge/ebsa285-leds.c')
| -rw-r--r-- | arch/arm/mach-footbridge/ebsa285-leds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-footbridge/ebsa285-leds.c b/arch/arm/mach-footbridge/ebsa285-leds.c index a64e22226515..09c1fbc51876 100644 --- a/arch/arm/mach-footbridge/ebsa285-leds.c +++ b/arch/arm/mach-footbridge/ebsa285-leds.c | |||
| @@ -128,7 +128,7 @@ static void ebsa285_leds_event(led_event_t evt) | |||
| 128 | 128 | ||
| 129 | static int __init leds_init(void) | 129 | static int __init leds_init(void) |
| 130 | { | 130 | { |
| 131 | if (machine_is_ebsa285() || machine_is_co285()) | 131 | if (machine_is_ebsa285()) |
| 132 | leds_event = ebsa285_leds_event; | 132 | leds_event = ebsa285_leds_event; |
| 133 | 133 | ||
| 134 | leds_event(led_start); | 134 | leds_event(led_start); |