diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 13:17:11 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 13:17:11 -0500 |
| commit | a46699c9a32505cb5bbfd16f76e7d4a2c84a7705 (patch) | |
| tree | 5c0bc91dd1c07ab95769f5749b3b58235c758d50 /arch/arm/mach-omap1/leds.c | |
| parent | 7ed0175a462c4c30f6df6fac1cccac058f997739 (diff) | |
| parent | b216c01829d0b73a468204e2e763c0a818b77a46 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-omap1/leds.c')
| -rw-r--r-- | arch/arm/mach-omap1/leds.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/leds.c b/arch/arm/mach-omap1/leds.c index 5c6b1bb6e722..3f9dcac4fd41 100644 --- a/arch/arm/mach-omap1/leds.c +++ b/arch/arm/mach-omap1/leds.c | |||
| @@ -33,7 +33,6 @@ omap_leds_init(void) | |||
| 33 | 33 | ||
| 34 | if (machine_is_omap_h2() | 34 | if (machine_is_omap_h2() |
| 35 | || machine_is_omap_h3() | 35 | || machine_is_omap_h3() |
| 36 | || machine_is_omap_perseus2() | ||
| 37 | #ifdef CONFIG_OMAP_OSK_MISTRAL | 36 | #ifdef CONFIG_OMAP_OSK_MISTRAL |
| 38 | || machine_is_omap_osk() | 37 | || machine_is_omap_osk() |
| 39 | #endif | 38 | #endif |