Merge branch 'fixes-gpio-to-irq' into fixes

[mirror_ubuntu-artful-kernel.git] / arch / arm / mach-omap1 / board-palmte.c

diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
index 0863d8e2bdf147ed70467bb8a7fb5748e5b6c701..a60e6c22f8169ed9027e26b2425b54875d23deba 100644 (file)
--- a/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
@@ -217,7 +217,6 @@ static struct spi_board_info palmte_spi_info[] __initdata = {
                .modalias       = "tsc2102",
                .bus_num        = 2,    /* uWire (officially) */
                .chip_select    = 0,    /* As opposed to 3 */
-               .irq            = OMAP_GPIO_IRQ(PALMTE_PINTDAV_GPIO),
                .max_speed_hz   = 8000000,
        },
 };
@@ -251,6 +250,7 @@ static void __init omap_palmte_init(void)
 
        platform_add_devices(palmte_devices, ARRAY_SIZE(palmte_devices));
 
+       palmte_spi_info[0].irq = gpio_to_irq(PALMTE_PINTDAV_GPIO);
        spi_register_board_info(palmte_spi_info, ARRAY_SIZE(palmte_spi_info));
        palmte_misc_gpio_setup();
        omap_serial_init();