From: trickie@gmail.com <trickie@gmail.com>
Date: Fri, 2 May 2008 13:05:35 +0000 (+0200)
Subject: Fix n800 build - only register HW keyboard on i2c board if CONFIG_MACH_NOKIA_N810
X-Git-Tag: v2.6.26-omap1~123^2~145
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=547ba9200727d2334f779cbf46ab62accb1281aa;p=linux-2.6-omap-h63xx.git

Fix n800 build - only register HW keyboard on i2c board if CONFIG_MACH_NOKIA_N810

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>
---

diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c
index 8b5956b8028..b62f2d5b4d1 100644
--- a/arch/arm/mach-omap2/board-n800.c
+++ b/arch/arm/mach-omap2/board-n800.c
@@ -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",