diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 13:42:14 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 13:42:21 +0100 |
commit | fb0b82b32ce17564bc64cede50bf4a3204eecc60 (patch) | |
tree | 00b5e466074c6fb373d64c493b3341186024acc7 /arch/arm/mach-mmp | |
parent | Merge branch 'kirkwood/board' into next/boards (diff) | |
parent | ARM: pxa: add dummy clock for pxa25x and pxa27x (diff) | |
download | linux-fb0b82b32ce17564bc64cede50bf4a3204eecc60.tar.xz linux-fb0b82b32ce17564bc64cede50bf4a3204eecc60.zip |
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
* 'board-specific' of git://github.com/hzhuang1/linux: (5 commits)
ARM: pxa: add dummy clock for pxa25x and pxa27x
ARM: mmp: append irq name of gpio device
pxa/hx4700: Fix PXA_GPIO_IRQ_BASE/IRQ_NUM values
pxa/hx4700: Add ASIC3 LED support
pxa/hx4700: Correct StrataFlash block size discovery
(update to v3.3-rc5)
Diffstat (limited to 'arch/arm/mach-mmp')
-rw-r--r-- | arch/arm/mach-mmp/mmp2.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-mmp/pxa168.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-mmp/pxa910.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c index 617c60a170a4..c709a24a9d25 100644 --- a/arch/arm/mach-mmp/mmp2.c +++ b/arch/arm/mach-mmp/mmp2.c @@ -223,6 +223,7 @@ struct resource mmp2_resource_gpio[] = { }, { .start = IRQ_MMP2_GPIO, .end = IRQ_MMP2_GPIO, + .name = "gpio_mux", .flags = IORESOURCE_IRQ, }, }; diff --git a/arch/arm/mach-mmp/pxa168.c b/arch/arm/mach-mmp/pxa168.c index 7bc17eaa12eb..9f612565b140 100644 --- a/arch/arm/mach-mmp/pxa168.c +++ b/arch/arm/mach-mmp/pxa168.c @@ -167,6 +167,7 @@ struct resource pxa168_resource_gpio[] = { }, { .start = IRQ_PXA168_GPIOX, .end = IRQ_PXA168_GPIOX, + .name = "gpio_mux", .flags = IORESOURCE_IRQ, }, }; diff --git a/arch/arm/mach-mmp/pxa910.c b/arch/arm/mach-mmp/pxa910.c index 3241a25784d0..0c87e69adf9f 100644 --- a/arch/arm/mach-mmp/pxa910.c +++ b/arch/arm/mach-mmp/pxa910.c @@ -173,6 +173,7 @@ struct resource pxa910_resource_gpio[] = { }, { .start = IRQ_PXA910_AP_GPIO, .end = IRQ_PXA910_AP_GPIO, + .name = "gpio_mux", .flags = IORESOURCE_IRQ, }, }; |