diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 22:23:18 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 22:23:18 -0300 |
| commit | c2f90e9536887fb76fb6a2aa239a70fc49beda10 (patch) | |
| tree | f87e6b29248c45a92ec6b4b8ffe675bb52e6104b /arch/arm/mach-ixp2000/core.c | |
| parent | f3409f71a76838b1bc985f753eed787a3f17bc2c (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/arm/mach-ixp2000/core.c')
| -rw-r--r-- | arch/arm/mach-ixp2000/core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c index 81cdc826720..daf28074134 100644 --- a/arch/arm/mach-ixp2000/core.c +++ b/arch/arm/mach-ixp2000/core.c @@ -329,19 +329,19 @@ static int ixp2000_GPIO_irq_type(unsigned int irq, unsigned int type) /* * Then, set the proper trigger type. */ - if (type & IRQT_FALLING) + if (type & IRQ_TYPE_EDGE_FALLING) GPIO_IRQ_falling_edge |= 1 << line; else GPIO_IRQ_falling_edge &= ~(1 << line); - if (type & IRQT_RISING) + if (type & IRQ_TYPE_EDGE_RISING) GPIO_IRQ_rising_edge |= 1 << line; else GPIO_IRQ_rising_edge &= ~(1 << line); - if (type & IRQT_LOW) + if (type & IRQ_TYPE_LEVEL_LOW) GPIO_IRQ_level_low |= 1 << line; else GPIO_IRQ_level_low &= ~(1 << line); - if (type & IRQT_HIGH) + if (type & IRQ_TYPE_LEVEL_HIGH) GPIO_IRQ_level_high |= 1 << line; else GPIO_IRQ_level_high &= ~(1 << line); |