summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/pxa27x.c
diff options
context:
space:
mode:
authoreric miao <eric.miao@marvell.com>2008-03-04 07:19:58 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-04-19 12:29:04 +0200
commitb9e25aced33eeb7279ccbaef198f28370cfb4e93 (patch)
tree149cac52a08fd81dbfbf611f96332f2e5341c58a /arch/arm/mach-pxa/pxa27x.c
parent[ARM] pxa: integrate low IRQ chip (ICIP) and high IRQ chip (ICIP2) into one (diff)
downloadlinux-b9e25aced33eeb7279ccbaef198f28370cfb4e93.tar.xz
linux-b9e25aced33eeb7279ccbaef198f28370cfb4e93.zip
[ARM] pxa: merge assignment of set_wake into pxa_init_{irq,gpio}()
To further clean up the GPIO and IRQ structure: 1. pxa_init_irq_gpio() and pxa_init_gpio() combines into a single function pxa_init_gpio() 2. assignment of set_wake merged into pxa_init_{irq,gpio}() as an argument Signed-off-by: eric miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/pxa27x.c')
-rw-r--r--arch/arm/mach-pxa/pxa27x.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index 54d8448cad7b..87ade40865f1 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -340,9 +340,8 @@ set_pwer:
void __init pxa27x_init_irq(void)
{
- pxa_init_irq(34);
- pxa_init_irq_gpio(128);
- pxa_init_irq_set_wake(pxa27x_set_wake);
+ pxa_init_irq(34, pxa27x_set_wake);
+ pxa_init_gpio(128, pxa27x_set_wake);
}
/*