]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Fix n800 build - only register HW keyboard on i2c board if CONFIG_MACH_NOKIA_N810
authortrickie@gmail.com <trickie@gmail.com>
Fri, 2 May 2008 13:05:35 +0000 (15:05 +0200)
committerTony Lindgren <tony@atomide.com>
Fri, 2 May 2008 23:34:16 +0000 (16:34 -0700)
lm8323_pdata is only present if CONFIG_MACH_NOKIA_N810

Signed-off-by: Nick Loeve <trickie@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/board-n800.c

index 8b5956b8028c9f8ec43f9034d049df4029c51675..b62f2d5b4d1bf1a7c00bca8195151782b3e59749 100644 (file)
@@ -654,12 +654,14 @@ static struct i2c_board_info __initdata n800_i2c_board_info_2[] = {
                I2C_BOARD_INFO("tea5761", 0x10),
        },
 #endif
+#ifdef CONFIG_MACH_NOKIA_N810
        {
                I2C_BOARD_INFO("lm8323", 0x45),
                .type           = "lm8323",
                .irq            = OMAP_GPIO_IRQ(109),
                .platform_data  = &lm8323_pdata,
        },
+#endif
        {
                I2C_BOARD_INFO("tsl2563", 0x29),
                .type           = "tsl2563",