diff options
| author | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 11:19:10 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 11:19:10 -0400 |
| commit | ddcc95963449d028b16d9b9fe50f6e91ce7d9e81 (patch) | |
| tree | aaf0392346a18b3e232ddeb5db3c4e917f7ca686 /arch/arm/mach-omap1/fpga.c | |
| parent | 223176bc722a7bf519904180e956292ae1d1e819 (diff) | |
| parent | 5f5024130287a9467a41b9f94ec170958ae45cbd (diff) | |
Merge branch 'master' of /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.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 c12a78335625..aca2a120813a 100644 --- a/arch/arm/mach-omap1/fpga.c +++ b/arch/arm/mach-omap1/fpga.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/arm/mach-omap/fpga.c | 2 | * linux/arch/arm/mach-omap1/fpga.c |
| 3 | * | 3 | * |
| 4 | * Interrupt handler for OMAP-1510 Innovator FPGA | 4 | * Interrupt handler for OMAP-1510 Innovator FPGA |
| 5 | * | 5 | * |
| @@ -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 | omap_set_gpio_edge_ctrl(13, OMAP_GPIO_RISING_EDGE); | 184 | set_irq_type(OMAP_GPIO_IRQ(13), IRQT_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 | ||