diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-14 05:21:26 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-27 06:51:18 -0500 |
commit | afc11e6ef7547243f1429cce8de616049439a172 (patch) | |
tree | 829f95bc7a821c21f98f3eccee5aaad36a4f052d /arch/arm/mach-mx3 | |
parent | 070ed7335961825f6c1a137b929c67627c31c907 (diff) |
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 = { | |||
476 | }; | 476 | }; |
477 | #endif | 477 | #endif |
478 | 478 | ||
479 | #if defined(CONFIG_I2C_IMX) || defined(CONFIG_I2C_IMX_MODULE) | ||
480 | static struct i2c_board_info __initdata mx31ads_i2c1_devices[] = { | 479 | static struct i2c_board_info __initdata mx31ads_i2c1_devices[] = { |
481 | #ifdef CONFIG_MACH_MX31ADS_WM1133_EV1 | 480 | #ifdef CONFIG_MACH_MX31ADS_WM1133_EV1 |
482 | { | 481 | { |
@@ -497,11 +496,6 @@ static void mxc_init_i2c(void) | |||
497 | 496 | ||
498 | imx31_add_imx_i2c1(NULL); | 497 | imx31_add_imx_i2c1(NULL); |
499 | } | 498 | } |
500 | #else | ||
501 | static void mxc_init_i2c(void) | ||
502 | { | ||
503 | } | ||
504 | #endif | ||
505 | 499 | ||
506 | static unsigned int ssi_pins[] = { | 500 | static unsigned int ssi_pins[] = { |
507 | MX31_PIN_SFS5__SFS5, | 501 | MX31_PIN_SFS5__SFS5, |