diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-14 05:18:02 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-27 06:51:13 -0500 |
commit | 0fbfd987ffd5e0b0d137a5684d4865bb1efac6a3 (patch) | |
tree | 99543885cf2b2b80a3ac514df1900988c3b4b8ac /arch/arm/mach-mx3 | |
parent | 376e9c5848abef8c72c09bd89f2f7ee128caa104 (diff) |
ARM i.MX35 pcm043: 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-pcm043.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm043.c b/arch/arm/mach-mx3/mach-pcm043.c index bcf83fc7e701..a27022d15c27 100644 --- a/arch/arm/mach-mx3/mach-pcm043.c +++ b/arch/arm/mach-mx3/mach-pcm043.c | |||
@@ -115,7 +115,6 @@ static const struct imxuart_platform_data uart_pdata __initconst = { | |||
115 | .flags = IMXUART_HAVE_RTSCTS, | 115 | .flags = IMXUART_HAVE_RTSCTS, |
116 | }; | 116 | }; |
117 | 117 | ||
118 | #if defined CONFIG_I2C_IMX || defined CONFIG_I2C_IMX_MODULE | ||
119 | static const struct imxi2c_platform_data pcm043_i2c0_data __initconst = { | 118 | static const struct imxi2c_platform_data pcm043_i2c0_data __initconst = { |
120 | .bitrate = 50000, | 119 | .bitrate = 50000, |
121 | }; | 120 | }; |
@@ -134,7 +133,6 @@ static struct i2c_board_info pcm043_i2c_devices[] = { | |||
134 | I2C_BOARD_INFO("pcf8563", 0x51), | 133 | I2C_BOARD_INFO("pcf8563", 0x51), |
135 | } | 134 | } |
136 | }; | 135 | }; |
137 | #endif | ||
138 | 136 | ||
139 | static struct platform_device *devices[] __initdata = { | 137 | static struct platform_device *devices[] __initdata = { |
140 | &pcm043_flash, | 138 | &pcm043_flash, |
@@ -369,12 +367,10 @@ static void __init mxc_board_init(void) | |||
369 | 367 | ||
370 | imx35_add_imx_uart1(&uart_pdata); | 368 | imx35_add_imx_uart1(&uart_pdata); |
371 | 369 | ||
372 | #if defined CONFIG_I2C_IMX || defined CONFIG_I2C_IMX_MODULE | ||
373 | i2c_register_board_info(0, pcm043_i2c_devices, | 370 | i2c_register_board_info(0, pcm043_i2c_devices, |
374 | ARRAY_SIZE(pcm043_i2c_devices)); | 371 | ARRAY_SIZE(pcm043_i2c_devices)); |
375 | 372 | ||
376 | imx35_add_imx_i2c0(&pcm043_i2c0_data); | 373 | imx35_add_imx_i2c0(&pcm043_i2c0_data); |
377 | #endif | ||
378 | 374 | ||
379 | mxc_register_device(&mx3_ipu, &mx3_ipu_data); | 375 | mxc_register_device(&mx3_ipu, &mx3_ipu_data); |
380 | mxc_register_device(&mx3_fb, &mx3fb_pdata); | 376 | mxc_register_device(&mx3_fb, &mx3fb_pdata); |