diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-15 17:13:26 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-15 17:13:26 -0500 |
| commit | 7e1548a597ef7e26d5d62f8be3be6da9e101b26c (patch) | |
| tree | fe6cbf4d9a3c1afdba04fb276fef0f932403727c /arch/arm/mach-omap1/leds.c | |
| parent | 1f7f569c0ae6e619504095eabf796edd712d943d (diff) | |
| parent | 2619bc327417f549f1c89d5ef9b4a4aa768f41a2 (diff) | |
Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
Diffstat (limited to 'arch/arm/mach-omap1/leds.c')
| -rw-r--r-- | arch/arm/mach-omap1/leds.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/leds.c b/arch/arm/mach-omap1/leds.c index 6cdad93c4a00..8cbf2562dcaa 100644 --- a/arch/arm/mach-omap1/leds.c +++ b/arch/arm/mach-omap1/leds.c | |||
| @@ -47,14 +47,14 @@ omap_leds_init(void) | |||
| 47 | * that's a different kind of LED (just one color at a time). | 47 | * that's a different kind of LED (just one color at a time). |
| 48 | */ | 48 | */ |
| 49 | omap_cfg_reg(P18_1610_GPIO3); | 49 | omap_cfg_reg(P18_1610_GPIO3); |
| 50 | if (omap_request_gpio(3) == 0) | 50 | if (gpio_request(3, "LED red") == 0) |
| 51 | omap_set_gpio_direction(3, 0); | 51 | gpio_direction_output(3, 1); |
| 52 | else | 52 | else |
| 53 | printk(KERN_WARNING "LED: can't get GPIO3/red?\n"); | 53 | printk(KERN_WARNING "LED: can't get GPIO3/red?\n"); |
| 54 | 54 | ||
| 55 | omap_cfg_reg(MPUIO4); | 55 | omap_cfg_reg(MPUIO4); |
| 56 | if (omap_request_gpio(OMAP_MPUIO(4)) == 0) | 56 | if (gpio_request(OMAP_MPUIO(4), "LED green") == 0) |
| 57 | omap_set_gpio_direction(OMAP_MPUIO(4), 0); | 57 | gpio_direction_output(OMAP_MPUIO(4), 1); |
| 58 | else | 58 | else |
| 59 | printk(KERN_WARNING "LED: can't get MPUIO4/green?\n"); | 59 | printk(KERN_WARNING "LED: can't get MPUIO4/green?\n"); |
| 60 | } | 60 | } |