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

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

diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index fe95ec5f6f03f3597511be1a54c8cf8b90d464c8..d21dcc2fbc5af3a3b53477e8e735aa5bcb428447 100644 (file)
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -147,7 +147,6 @@ static struct spi_board_info nokia770_spi_board_info[] __initdata = {
                .bus_num        = 2,
                .chip_select    = 0,
                .max_speed_hz   = 2500000,
-               .irq            = OMAP_GPIO_IRQ(15),
                .platform_data  = &nokia770_ads7846_platform_data,
        },
 };
@@ -237,6 +236,7 @@ static void __init omap_nokia770_init(void)
        omap_writew((omap_readw(0xfffb5004) & ~2), 0xfffb5004);
 
        platform_add_devices(nokia770_devices, ARRAY_SIZE(nokia770_devices));
+       nokia770_spi_board_info[1].irq = gpio_to_irq(15);
        spi_register_board_info(nokia770_spi_board_info,
                                ARRAY_SIZE(nokia770_spi_board_info));
        omap_serial_init();