diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
| commit | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch) | |
| tree | a03891a32abe0da191fb765fe669a597e07423c6 /arch/arm/plat-omap/gpio.c | |
| parent | 90bb28b0644f7324f8bd1feb27b35146e6785ba2 (diff) | |
| parent | 8ec53663d2698076468b3e1edc4e1b418bd54de3 (diff) | |
Merge branch 'ptebits' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/plat-omap/gpio.c')
| -rw-r--r-- | arch/arm/plat-omap/gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index e622fa2825b5..5764bce98cf3 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c | |||
| @@ -1487,7 +1487,7 @@ static int __init _omap_gpio_init(void) | |||
| 1487 | bank->chip.set = gpio_set; | 1487 | bank->chip.set = gpio_set; |
| 1488 | if (bank_is_mpuio(bank)) { | 1488 | if (bank_is_mpuio(bank)) { |
| 1489 | bank->chip.label = "mpuio"; | 1489 | bank->chip.label = "mpuio"; |
| 1490 | #ifdef CONFIG_ARCH_OMAP1 | 1490 | #ifdef CONFIG_ARCH_OMAP16XX |
| 1491 | bank->chip.dev = &omap_mpuio_device.dev; | 1491 | bank->chip.dev = &omap_mpuio_device.dev; |
| 1492 | #endif | 1492 | #endif |
| 1493 | bank->chip.base = OMAP_MPUIO(0); | 1493 | bank->chip.base = OMAP_MPUIO(0); |