diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-03-12 16:41:28 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-03-12 16:41:28 +0100 |
| commit | e2aa4177264c1a459779d6e35fae22adf17a9232 (patch) | |
| tree | beba4b40aa90f6f033eb261cf5a5453c5957c87c /arch/arm/mach-omap2/board-omap3evm.c | |
| parent | gpio/omap: Fix IRQ handling for SPARSE_IRQ (diff) | |
| parent | Linux 3.3-rc7 (diff) | |
| download | linux-e2aa4177264c1a459779d6e35fae22adf17a9232.tar.xz linux-e2aa4177264c1a459779d6e35fae22adf17a9232.zip | |
Merge tag 'v3.3-rc7' into gpio/next
Linux 3.3-rc7. Merged into the gpio branch to pick up gpio bugfixes already
in mainline before queueing up move v3.4 patches
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3evm.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index c775bead1497..c877236a8442 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -381,7 +381,7 @@ static int omap3evm_twl_gpio_setup(struct device *dev, gpio_request_one(gpio + 7, GPIOF_OUT_INIT_LOW, "EN_DVI"); /* TWL4030_GPIO_MAX + 1 == ledB (out, active low LED) */ - gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; + gpio_leds[0].gpio = gpio + TWL4030_GPIO_MAX + 1; platform_device_register(&leds_gpio); |