diff options
| author |   Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-14 11:21:26 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-27 12:51:18 +0100 |
| commit | afc11e6ef7547243f1429cce8de616049439a172 (patch) | |
| tree | 829f95bc7a821c21f98f3eccee5aaad36a4f052d /arch/arm/mach-mx3 | |
| parent | ARM i.MX35 pcm043: put usbh1 outside CONFIG_USB_ULPI (diff) | |
| download | linux-dev-afc11e6ef7547243f1429cce8de616049439a172.tar.xz linux-dev-afc11e6ef7547243f1429cce8de616049439a172.zip | |
ARM i.MX31 mx31ads: remove unnecessary CONFIG_I2C ifdefs
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3')
| -rw-r--r-- | arch/arm/mach-mx3/mach-mx31ads.c | 6 |
1 files changed, 0 insertions, 6 deletions
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, |