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-omap2/board-apollon.c | |
| parent | 5a7a201c51c324876d00a54e7208af6af12d1ca4 (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'arch/arm/mach-omap2/board-apollon.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-apollon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index 620fa0f120ee..870b34972d3b 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c | |||
| @@ -337,17 +337,17 @@ static void __init apollon_sw_init(void) | |||
| 337 | omap_request_gpio(SW_DOWN_GPIO58); | 337 | omap_request_gpio(SW_DOWN_GPIO58); |
| 338 | omap_set_gpio_direction(SW_DOWN_GPIO58, 1); | 338 | omap_set_gpio_direction(SW_DOWN_GPIO58, 1); |
| 339 | 339 | ||
| 340 | set_irq_type(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), IRQT_RISING); | 340 | set_irq_type(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), IRQ_TYPE_EDGE_RISING); |
| 341 | if (request_irq(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), &apollon_sw_interrupt, | 341 | if (request_irq(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), &apollon_sw_interrupt, |
| 342 | IRQF_SHARED, "enter sw", | 342 | IRQF_SHARED, "enter sw", |
| 343 | &apollon_sw_interrupt)) | 343 | &apollon_sw_interrupt)) |
| 344 | return; | 344 | return; |
| 345 | set_irq_type(OMAP_GPIO_IRQ(SW_UP_GPIO17), IRQT_RISING); | 345 | set_irq_type(OMAP_GPIO_IRQ(SW_UP_GPIO17), IRQ_TYPE_EDGE_RISING); |
| 346 | if (request_irq(OMAP_GPIO_IRQ(SW_UP_GPIO17), &apollon_sw_interrupt, | 346 | if (request_irq(OMAP_GPIO_IRQ(SW_UP_GPIO17), &apollon_sw_interrupt, |
| 347 | IRQF_SHARED, "up sw", | 347 | IRQF_SHARED, "up sw", |
| 348 | &apollon_sw_interrupt)) | 348 | &apollon_sw_interrupt)) |
| 349 | return; | 349 | return; |
| 350 | set_irq_type(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), IRQT_RISING); | 350 | set_irq_type(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), IRQ_TYPE_EDGE_RISING); |
| 351 | if (request_irq(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), &apollon_sw_interrupt, | 351 | if (request_irq(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), &apollon_sw_interrupt, |
| 352 | IRQF_SHARED, "down sw", | 352 | IRQF_SHARED, "down sw", |
| 353 | &apollon_sw_interrupt)) | 353 | &apollon_sw_interrupt)) |