diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-29 06:10:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-29 06:10:50 -0400 |
| commit | 35780c8ea7ad5c6d5483244d5f5bf37176fda86a (patch) | |
| tree | 2bc34969f558da2a9b3de915e3f2499a959085da /arch/arm/mach-omap1/board-voiceblue.c | |
| parent | 6ce37a58e334ef773f88283939afc9f4965c7697 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into x86/urgent
Diffstat (limited to 'arch/arm/mach-omap1/board-voiceblue.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-voiceblue.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c index 5c00b3f39cdd..8948d45a2769 100644 --- a/arch/arm/mach-omap1/board-voiceblue.c +++ b/arch/arm/mach-omap1/board-voiceblue.c | |||
| @@ -186,10 +186,10 @@ static void __init voiceblue_init(void) | |||
| 186 | omap_request_gpio(13); | 186 | omap_request_gpio(13); |
| 187 | omap_request_gpio(14); | 187 | omap_request_gpio(14); |
| 188 | omap_request_gpio(15); | 188 | omap_request_gpio(15); |
| 189 | set_irq_type(OMAP_GPIO_IRQ(12), IRQT_RISING); | 189 | set_irq_type(OMAP_GPIO_IRQ(12), IRQ_TYPE_EDGE_RISING); |
| 190 | set_irq_type(OMAP_GPIO_IRQ(13), IRQT_RISING); | 190 | set_irq_type(OMAP_GPIO_IRQ(13), IRQ_TYPE_EDGE_RISING); |
| 191 | set_irq_type(OMAP_GPIO_IRQ(14), IRQT_RISING); | 191 | set_irq_type(OMAP_GPIO_IRQ(14), IRQ_TYPE_EDGE_RISING); |
| 192 | set_irq_type(OMAP_GPIO_IRQ(15), IRQT_RISING); | 192 | set_irq_type(OMAP_GPIO_IRQ(15), IRQ_TYPE_EDGE_RISING); |
| 193 | 193 | ||
| 194 | platform_add_devices(voiceblue_devices, ARRAY_SIZE(voiceblue_devices)); | 194 | platform_add_devices(voiceblue_devices, ARRAY_SIZE(voiceblue_devices)); |
| 195 | omap_board_config = voiceblue_config; | 195 | omap_board_config = voiceblue_config; |