Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-apollon.c

diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index 755f93b0a56873fac7f7513846eba0748d1d4b2b..994c9478dd6a8b5b4276f1510c44c74ef6c8c8f5 100644 (file)
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -399,7 +399,7 @@ static void __init apollon_tsc_init(void)
 {
        /* TSC2101 */
        omap_cfg_reg(N15_24XX_GPIO85);
-       omap_request_gpio(85);
+       gpio_request(85, "tsc2101 irq");
        gpio_direction_input(85);
 
        omap_cfg_reg(W14_24XX_SYS_CLKOUT);      /* mclk */