diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 21:23:18 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 21:23:18 -0400 |
| commit | c2f90e9536887fb76fb6a2aa239a70fc49beda10 (patch) | |
| tree | f87e6b29248c45a92ec6b4b8ffe675bb52e6104b /arch/arm/mach-omap1/board-voiceblue.c | |
| parent | f3409f71a76838b1bc985f753eed787a3f17bc2c (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge ../linux-2.6
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; |