summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/fpga.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-27 16:51:21 -0700
committerDavid S. Miller <davem@davemloft.net>2008-07-27 16:51:21 -0700
commit281c7413ed914623d3245299a4761b6b27ab9fdb (patch)
tree182b5222a7ad4b77c32f7845ea777ca665d7def2 /arch/arm/mach-omap1/fpga.c
parent2ab61b01110aa04cd853c619a74881e3225a5e24 (diff)
parentc9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff)
downloadkernel-crypto-281c7413ed914623d3245299a4761b6b27ab9fdb.tar.gz
kernel-crypto-281c7413ed914623d3245299a4761b6b27ab9fdb.tar.xz
kernel-crypto-281c7413ed914623d3245299a4761b6b27ab9fdb.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-omap1/fpga.c')
-rw-r--r--arch/arm/mach-omap1/fpga.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c
index 0cf62ef5ecb..d963125ed75 100644
--- a/arch/arm/mach-omap1/fpga.c
+++ b/arch/arm/mach-omap1/fpga.c
@@ -181,7 +181,7 @@ void omap1510_fpga_init_irq(void)
*/
omap_request_gpio(13);
omap_set_gpio_direction(13, 1);
- set_irq_type(OMAP_GPIO_IRQ(13), IRQT_RISING);
+ set_irq_type(OMAP_GPIO_IRQ(13), IRQ_TYPE_EDGE_RISING);
set_irq_chained_handler(OMAP1510_INT_FPGA, innovator_fpga_IRQ_demux);
}