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 'x86/fpu' into x86/urgent
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
cm-x270-pci.c
diff --git
a/arch/arm/mach-pxa/cm-x270-pci.c
b/arch/arm/mach-pxa/cm-x270-pci.c
index
bcf0cde
..
2d5bcea
100644
(file)
--- a/
arch/arm/mach-pxa/cm-x270-pci.c
+++ b/
arch/arm/mach-pxa/cm-x270-pci.c
@@
-22,7
+22,7
@@
#include <linux/gpio.h>
#include <asm/mach/pci.h>
#include <linux/gpio.h>
#include <asm/mach/pci.h>
-#include <
asm/ar
ch/pxa-regs.h>
+#include <
ma
ch/pxa-regs.h>
#include <asm/mach-types.h>
#include <asm/hardware/it8152.h>
#include <asm/mach-types.h>
#include <asm/hardware/it8152.h>
@@
-71,7
+71,7
@@
void __cmx270_pci_init_irq(int irq_gpio)
cmx270_it8152_irq_gpio = irq_gpio;
cmx270_it8152_irq_gpio = irq_gpio;
- set_irq_type(gpio_to_irq(irq_gpio), IRQ
T
_RISING);
+ set_irq_type(gpio_to_irq(irq_gpio), IRQ
_TYPE_EDGE
_RISING);
set_irq_chained_handler(gpio_to_irq(irq_gpio), cmx270_it8152_irq_demux);
}
set_irq_chained_handler(gpio_to_irq(irq_gpio), cmx270_it8152_irq_demux);
}