diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 14:06:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:06:52 -0400 |
| commit | 5ff7f78a3db462ea4edf1a781a2002d4e8a8a473 (patch) | |
| tree | fc0516369f4146595c5dce9bddda23d8691c3f42 /arch/arm/mach-pxa/leds.c | |
| parent | 35437b6192d9a4eb92f095dfd72396b6d2970f0b (diff) | |
| parent | 92b797f6a1347623a41caf02516b70e5fa706a90 (diff) | |
Merge branch 'pxa-trizeps' into pxa-machines
Conflicts:
drivers/pcmcia/Makefile
Diffstat (limited to 'arch/arm/mach-pxa/leds.c')
| -rw-r--r-- | arch/arm/mach-pxa/leds.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/leds.c b/arch/arm/mach-pxa/leds.c index e13eb841e48d..bbe4d5f6afaa 100644 --- a/arch/arm/mach-pxa/leds.c +++ b/arch/arm/mach-pxa/leds.c | |||
| @@ -24,8 +24,6 @@ pxa_leds_init(void) | |||
| 24 | leds_event = mainstone_leds_event; | 24 | leds_event = mainstone_leds_event; |
| 25 | if (machine_is_pxa_idp()) | 25 | if (machine_is_pxa_idp()) |
| 26 | leds_event = idp_leds_event; | 26 | leds_event = idp_leds_event; |
| 27 | if (machine_is_trizeps4()) | ||
| 28 | leds_event = trizeps4_leds_event; | ||
| 29 | 27 | ||
| 30 | leds_event(led_start); | 28 | leds_event(led_start); |
| 31 | return 0; | 29 | return 0; |