ARM: OMAP: Fix gpio by switching to generic gpio calls

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap1 / board-h2.c

diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 97f26f9ee4d1242cf4aae0a101dc047c59527357..359f6e4e530a8085cdb58c50feb1d87d9d25ae73 100644 (file)
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -40,6 +40,7 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 
+#include <mach/dma.h>
 #include <mach/gpio.h>
 #include <mach/gpio-switch.h>
 #include <mach/mux.h>
@@ -410,8 +411,8 @@ static void __init h2_init(void)
        /* Irda */
 #if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
        omap_writel(omap_readl(FUNC_MUX_CTRL_A) | 7, FUNC_MUX_CTRL_A);
-       if (!(omap_request_gpio(H2_IRDA_FIRSEL_GPIO_PIN))) {
-               omap_set_gpio_direction(H2_IRDA_FIRSEL_GPIO_PIN, 0);
+       if (!(gpio_request(H2_IRDA_FIRSEL_GPIO_PIN, "irda firsel"))) {
+               gpio_direction_output(H2_IRDA_FIRSEL_GPIO_PIN);
                h2_irda_data.transceiver_mode = h2_transceiver_mode;
        }
 #endif