summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/irq.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 22:23:18 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 22:23:18 -0300
commitc2f90e9536887fb76fb6a2aa239a70fc49beda10 (patch)
treef87e6b29248c45a92ec6b4b8ffe675bb52e6104b /arch/arm/mach-at91/irq.c
parentf3409f71a76838b1bc985f753eed787a3f17bc2c (diff)
parentc9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff)
downloadop-kernel-dev-c2f90e9536887fb76fb6a2aa239a70fc49beda10.zip
op-kernel-dev-c2f90e9536887fb76fb6a2aa239a70fc49beda10.tar.gz
Merge ../linux-2.6
Diffstat (limited to 'arch/arm/mach-at91/irq.c')
-rw-r--r--arch/arm/mach-at91/irq.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/irq.c b/arch/arm/mach-at91/irq.c
index 78a5cdb..ca87587 100644
--- a/arch/arm/mach-at91/irq.c
+++ b/arch/arm/mach-at91/irq.c
@@ -56,19 +56,19 @@ static int at91_aic_set_type(unsigned irq, unsigned type)
unsigned int smr, srctype;
switch (type) {
- case IRQT_HIGH:
+ case IRQ_TYPE_LEVEL_HIGH:
srctype = AT91_AIC_SRCTYPE_HIGH;
break;
- case IRQT_RISING:
+ case IRQ_TYPE_EDGE_RISING:
srctype = AT91_AIC_SRCTYPE_RISING;
break;
- case IRQT_LOW:
+ case IRQ_TYPE_LEVEL_LOW:
if ((irq == AT91_ID_FIQ) || is_extern_irq(irq)) /* only supported on external interrupts */
srctype = AT91_AIC_SRCTYPE_LOW;
else
return -EINVAL;
break;
- case IRQT_FALLING:
+ case IRQ_TYPE_EDGE_FALLING:
if ((irq == AT91_ID_FIQ) || is_extern_irq(irq)) /* only supported on external interrupts */
srctype = AT91_AIC_SRCTYPE_FALLING;
else
OpenPOWER on IntegriCloud