From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Fri, 14 Jan 2011 10:21:26 +0000 (+0100)
Subject: ARM i.MX31 mx31ads: remove unnecessary CONFIG_I2C ifdefs
X-Git-Tag: firefly_0821_release~7613^2~2162^2~5^2~107^2~10
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=afc11e6ef7547243f1429cce8de616049439a172;p=firefly-linux-kernel-4.4.55.git

ARM i.MX31 mx31ads: remove unnecessary CONFIG_I2C ifdefs

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---

diff --git a/arch/arm/mach-mx3/mach-mx31ads.c b/arch/arm/mach-mx3/mach-mx31ads.c
index 88b97d62b57e..f9a71096be49 100644
--- a/arch/arm/mach-mx3/mach-mx31ads.c
+++ b/arch/arm/mach-mx3/mach-mx31ads.c
@@ -476,7 +476,6 @@ static struct wm8350_platform_data __initdata mx31_wm8350_pdata = {
 };
 #endif
 
-#if defined(CONFIG_I2C_IMX) || defined(CONFIG_I2C_IMX_MODULE)
 static struct i2c_board_info __initdata mx31ads_i2c1_devices[] = {
 #ifdef CONFIG_MACH_MX31ADS_WM1133_EV1
 	{
@@ -497,11 +496,6 @@ static void mxc_init_i2c(void)
 
 	imx31_add_imx_i2c1(NULL);
 }
-#else
-static void mxc_init_i2c(void)
-{
-}
-#endif
 
 static unsigned int ssi_pins[] = {
 	MX31_PIN_SFS5__SFS5,