diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-25 03:19:59 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-25 03:19:59 -0400 |
| commit | bdf4e9482360a3ddc1619efbd5d1c928ede8c3fa (patch) | |
| tree | b02319e809c5b8abfca85409a11472775e27f597 /arch/arm/mach-sa1100/leds.c | |
| parent | 06afb1a087d49ae0f676b2e5b9ffe5f4b3aba355 (diff) | |
| parent | eb0474544bc16a9dab53b26abd846e86ba814eb1 (diff) | |
Merge branch 'misc' into for-linus
Conflicts:
arch/arm/mach-integrator/integrator_ap.c
Diffstat (limited to 'arch/arm/mach-sa1100/leds.c')
| -rw-r--r-- | arch/arm/mach-sa1100/leds.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/leds.c b/arch/arm/mach-sa1100/leds.c index bbfe197fb4d6..5fe71a0f1053 100644 --- a/arch/arm/mach-sa1100/leds.c +++ b/arch/arm/mach-sa1100/leds.c | |||
| @@ -42,8 +42,6 @@ sa1100_leds_init(void) | |||
| 42 | leds_event = adsbitsy_leds_event; | 42 | leds_event = adsbitsy_leds_event; |
| 43 | if (machine_is_pt_system3()) | 43 | if (machine_is_pt_system3()) |
| 44 | leds_event = system3_leds_event; | 44 | leds_event = system3_leds_event; |
| 45 | if (machine_is_simpad()) | ||
| 46 | leds_event = simpad_leds_event; /* what about machine registry? including led, apm... -zecke */ | ||
| 47 | 45 | ||
| 48 | leds_event(led_start); | 46 | leds_event(led_start); |
| 49 | return 0; | 47 | return 0; |