git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/cbou/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp2000
/
core.c
diff --git
a/arch/arm/mach-ixp2000/core.c
b/arch/arm/mach-ixp2000/core.c
index
81cdc82
..
daf2807
100644
(file)
--- 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.
*/
/*
* Then, set the proper trigger type.
*/
- if (type & IRQ
T
_FALLING)
+ if (type & IRQ
_TYPE_EDGE
_FALLING)
GPIO_IRQ_falling_edge |= 1 << line;
else
GPIO_IRQ_falling_edge &= ~(1 << line);
GPIO_IRQ_falling_edge |= 1 << line;
else
GPIO_IRQ_falling_edge &= ~(1 << line);
- if (type & IRQ
T
_RISING)
+ if (type & IRQ
_TYPE_EDGE
_RISING)
GPIO_IRQ_rising_edge |= 1 << line;
else
GPIO_IRQ_rising_edge &= ~(1 << line);
GPIO_IRQ_rising_edge |= 1 << line;
else
GPIO_IRQ_rising_edge &= ~(1 << line);
- if (type & IRQ
T
_LOW)
+ if (type & IRQ
_TYPE_LEVEL
_LOW)
GPIO_IRQ_level_low |= 1 << line;
else
GPIO_IRQ_level_low &= ~(1 << line);
GPIO_IRQ_level_low |= 1 << line;
else
GPIO_IRQ_level_low &= ~(1 << line);
- if (type & IRQ
T
_HIGH)
+ if (type & IRQ
_TYPE_LEVEL
_HIGH)
GPIO_IRQ_level_high |= 1 << line;
else
GPIO_IRQ_level_high &= ~(1 << line);
GPIO_IRQ_level_high |= 1 << line;
else
GPIO_IRQ_level_high &= ~(1 << line);