diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 14:08:56 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:08:56 -0400 |
| commit | 5a89770daad83df74d77a8d34a1ffaedae565ce9 (patch) | |
| tree | 0d8ef70293a6ef969ba8b7718e59608337643d40 /arch/arm/mach-pxa/leds.c | |
| parent | c46c948260f41af18b277c1eb1895d788d3605dc (diff) | |
| parent | af7c951d76708c61b862463d579d76be757130bf (diff) | |
Merge branches 'pxa-core' and 'pxa-machines' into pxa-all
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
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; |