diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
| commit | 414f746d232d41ed6ae8632c4495ae795373c44b (patch) | |
| tree | 167f9bc8f139c6e82e6732b38c7a938b8a9d31cd /arch/arm/mach-omap1/fpga.c | |
| parent | 5a7a201c51c324876d00a54e7208af6af12d1ca4 (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'arch/arm/mach-omap1/fpga.c')
| -rw-r--r-- | arch/arm/mach-omap1/fpga.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c index 0cf62ef5ecb7..d963125ed755 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) | |||
| 181 | */ | 181 | */ |
| 182 | omap_request_gpio(13); | 182 | omap_request_gpio(13); |
| 183 | omap_set_gpio_direction(13, 1); | 183 | omap_set_gpio_direction(13, 1); |
| 184 | set_irq_type(OMAP_GPIO_IRQ(13), IRQT_RISING); | 184 | set_irq_type(OMAP_GPIO_IRQ(13), IRQ_TYPE_EDGE_RISING); |
| 185 | set_irq_chained_handler(OMAP1510_INT_FPGA, innovator_fpga_IRQ_demux); | 185 | set_irq_chained_handler(OMAP1510_INT_FPGA, innovator_fpga_IRQ_demux); |
| 186 | } | 186 | } |
| 187 | 187 | ||