diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
| commit | c64eae9a73a847c1698f913c893aa4012d2a30b0 (patch) | |
| tree | 732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /arch/arm/mach-omap2/board-devkit8000.c | |
| parent | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
Merge commit 'v2.6.38-rc3' into devicetree/next
Diffstat (limited to 'arch/arm/mach-omap2/board-devkit8000.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-devkit8000.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 00bb1fc5e01..e906e05bb41 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c | |||
| @@ -275,8 +275,7 @@ static struct twl4030_gpio_platform_data devkit8000_gpio_data = { | |||
| 275 | .irq_base = TWL4030_GPIO_IRQ_BASE, | 275 | .irq_base = TWL4030_GPIO_IRQ_BASE, |
| 276 | .irq_end = TWL4030_GPIO_IRQ_END, | 276 | .irq_end = TWL4030_GPIO_IRQ_END, |
| 277 | .use_leds = true, | 277 | .use_leds = true, |
| 278 | .pullups = BIT(1), | 278 | .pulldowns = BIT(1) | BIT(2) | BIT(6) | BIT(8) | BIT(13) |
| 279 | .pulldowns = BIT(2) | BIT(6) | BIT(7) | BIT(8) | BIT(13) | ||
| 280 | | BIT(15) | BIT(16) | BIT(17), | 279 | | BIT(15) | BIT(16) | BIT(17), |
| 281 | .setup = devkit8000_twl_gpio_setup, | 280 | .setup = devkit8000_twl_gpio_setup, |
| 282 | }; | 281 | }; |