From: Trilok Soni <soni.trilok@gmail.com>
Date: Fri, 15 Jun 2007 11:53:25 +0000 (+0530)
Subject: ARM: OMAP: Remove unnecessary #ifdef CONFIG_MENELAUS
X-Git-Tag: v2.6.22-omap1~22
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=22cb4ad3b46c0a7851607b76ebe4249a3d76f6f2;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Remove unnecessary #ifdef CONFIG_MENELAUS

--
--Trilok Soni

From e6b47c5334cda7485d4d0ec4907349ffdf7b9b86 Mon Sep 17 00:00:00 2001
From: Trilok Soni <soni.trilok@gmail.com>
Date: Sat, 26 May 2007 19:19:19 +0530
Subject: [PATCH] ARM: OMAP: Remove unnecessary #ifdef CONFIG_MENELAUS

Signed-off-by: Trilok Soni <soni.trilok@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 a050b476788..e2447fcddf6 100644
--- a/arch/arm/mach-omap2/board-n800.c
+++ b/arch/arm/mach-omap2/board-n800.c
@@ -527,13 +527,11 @@ static struct menelaus_platform_data n800_menelaus_platform_data = {
 #endif
 
 static struct i2c_board_info __initdata n800_i2c_board_info[] = {
-#ifdef CONFIG_MENELAUS
 	{
 		I2C_BOARD_INFO("menelaus", 0x72),
 		.irq = INT_24XX_SYS_NIRQ,
 		.platform_data = &n800_menelaus_platform_data,
 	},
-#endif
 };
 
 static void __init nokia_n800_init(void)