diff options
author | Darius Augulis <augulis.darius@gmail.com> | 2009-04-08 04:15:00 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-04-16 06:57:15 -0400 |
commit | 3fa6dd6a7aa7ce1a7d490ef88c2c8ec7db0f196b (patch) | |
tree | 9681f96307a843e84da4d00fb6718587b4bb00bc /arch/arm/mach-mx1 | |
parent | 248ca85f0135dcb03bc054cd172453b36aad6571 (diff) |
MX1ADS: remove I2C ifdefs
Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
Diffstat (limited to 'arch/arm/mach-mx1')
-rw-r--r-- | arch/arm/mach-mx1/mx1ads.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-mx1/mx1ads.c b/arch/arm/mach-mx1/mx1ads.c index 7ae229bc1b79..e54057fb855b 100644 --- a/arch/arm/mach-mx1/mx1ads.c +++ b/arch/arm/mach-mx1/mx1ads.c | |||
@@ -28,9 +28,7 @@ | |||
28 | #include <mach/common.h> | 28 | #include <mach/common.h> |
29 | #include <mach/imx-uart.h> | 29 | #include <mach/imx-uart.h> |
30 | #include <mach/irqs.h> | 30 | #include <mach/irqs.h> |
31 | #ifdef CONFIG_I2C_IMX | ||
32 | #include <mach/i2c.h> | 31 | #include <mach/i2c.h> |
33 | #endif | ||
34 | #include <mach/iomux.h> | 32 | #include <mach/iomux.h> |
35 | #include "devices.h" | 33 | #include "devices.h" |
36 | 34 | ||
@@ -114,7 +112,6 @@ static struct platform_device flash_device = { | |||
114 | * I2C | 112 | * I2C |
115 | */ | 113 | */ |
116 | 114 | ||
117 | #ifdef CONFIG_I2C_IMX | ||
118 | static int i2c_pins[] = { | 115 | static int i2c_pins[] = { |
119 | PA15_PF_I2C_SDA, | 116 | PA15_PF_I2C_SDA, |
120 | PA16_PF_I2C_SCL, | 117 | PA16_PF_I2C_SCL, |
@@ -157,7 +154,6 @@ static struct i2c_board_info mx1ads_i2c_devices[] = { | |||
157 | .platform_data = &pcf857x_data[1], | 154 | .platform_data = &pcf857x_data[1], |
158 | }, | 155 | }, |
159 | }; | 156 | }; |
160 | #endif | ||
161 | 157 | ||
162 | /* | 158 | /* |
163 | * Board init | 159 | * Board init |
@@ -172,12 +168,10 @@ static void __init mx1ads_init(void) | |||
172 | mxc_register_device(&flash_device, &mx1ads_flash_data); | 168 | mxc_register_device(&flash_device, &mx1ads_flash_data); |
173 | 169 | ||
174 | /* I2C */ | 170 | /* I2C */ |
175 | #ifdef CONFIG_I2C_IMX | ||
176 | i2c_register_board_info(0, mx1ads_i2c_devices, | 171 | i2c_register_board_info(0, mx1ads_i2c_devices, |
177 | ARRAY_SIZE(mx1ads_i2c_devices)); | 172 | ARRAY_SIZE(mx1ads_i2c_devices)); |
178 | 173 | ||
179 | mxc_register_device(&imx_i2c_device, &mx1ads_i2c_data); | 174 | mxc_register_device(&imx_i2c_device, &mx1ads_i2c_data); |
180 | #endif | ||
181 | } | 175 | } |
182 | 176 | ||
183 | static void __init mx1ads_timer_init(void) | 177 | static void __init mx1ads_timer_init(void) |