diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 15:26:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 15:26:48 -0700 |
| commit | 35b7ac4c48fa851600c028e088d2239a2cf3dfca (patch) | |
| tree | 13ab1abd15403eb1bc2099552b5f8c226596b838 /arch/arm/mach-omap1/fpga.c | |
| parent | 4e1491847ef5ca1c5a661601d5f96dcb7d90d2f0 (diff) | |
| parent | 61c8c158c828073cfebf11ca8e340727feafa038 (diff) | |
| download | kernel_samsung_espresso10-35b7ac4c48fa851600c028e088d2239a2cf3dfca.zip kernel_samsung_espresso10-35b7ac4c48fa851600c028e088d2239a2cf3dfca.tar.gz kernel_samsung_espresso10-35b7ac4c48fa851600c028e088d2239a2cf3dfca.tar.bz2 | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-omap1/fpga.c')
| -rw-r--r-- | arch/arm/mach-omap1/fpga.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c index c12a783..aca2a12 100644 --- a/arch/arm/mach-omap1/fpga.c +++ b/arch/arm/mach-omap1/fpga.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-omap/fpga.c + * linux/arch/arm/mach-omap1/fpga.c * * Interrupt handler for OMAP-1510 Innovator FPGA * @@ -181,7 +181,7 @@ void omap1510_fpga_init_irq(void) */ omap_request_gpio(13); omap_set_gpio_direction(13, 1); - omap_set_gpio_edge_ctrl(13, OMAP_GPIO_RISING_EDGE); + set_irq_type(OMAP_GPIO_IRQ(13), IRQT_RISING); set_irq_chained_handler(OMAP1510_INT_FPGA, innovator_fpga_IRQ_demux); } |