projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
070ed73
)
ARM i.MX31 mx31ads: remove unnecessary CONFIG_I2C ifdefs
author
Sascha Hauer
<s.hauer@pengutronix.de>
Fri, 14 Jan 2011 10:21:26 +0000
(11:21 +0100)
committer
Sascha Hauer
<s.hauer@pengutronix.de>
Thu, 27 Jan 2011 11:51:18 +0000
(12:51 +0100)
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
arch/arm/mach-mx3/mach-mx31ads.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-mx3/mach-mx31ads.c
b/arch/arm/mach-mx3/mach-mx31ads.c
index
88b97d6
..
f9a7109
100644
(file)
--- 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,