aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx1/mx1ads.c
diff options
context:
space:
mode:
authorDarius Augulis <augulis.darius@gmail.com>2009-04-08 11:15:00 +0300
committerSascha Hauer <s.hauer@pengutronix.de>2009-04-16 12:57:15 +0200
commit3fa6dd6a7aa7ce1a7d490ef88c2c8ec7db0f196b (patch)
tree9681f96307a843e84da4d00fb6718587b4bb00bc /arch/arm/mach-mx1/mx1ads.c
parent248ca85f0135dcb03bc054cd172453b36aad6571 (diff)
MX1ADS: remove I2C ifdefs
Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
Diffstat (limited to 'arch/arm/mach-mx1/mx1ads.c')
-rw-r--r--arch/arm/mach-mx1/mx1ads.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-mx1/mx1ads.c b/arch/arm/mach-mx1/mx1ads.c
index 7ae229bc1b7..e54057fb855 100644
--- a/arch/arm/mach-mx1/mx1ads.c
+++ b/arch/arm/mach-mx1/mx1ads.c
@@ -28,9 +28,7 @@
#include <mach/common.h>
#include <mach/imx-uart.h>
#include <mach/irqs.h>
-#ifdef CONFIG_I2C_IMX
#include <mach/i2c.h>
-#endif
#include <mach/iomux.h>
#include "devices.h"
@@ -114,7 +112,6 @@ static struct platform_device flash_device = {
* I2C
*/
-#ifdef CONFIG_I2C_IMX
static int i2c_pins[] = {
PA15_PF_I2C_SDA,
PA16_PF_I2C_SCL,
@@ -157,7 +154,6 @@ static struct i2c_board_info mx1ads_i2c_devices[] = {
.platform_data = &pcf857x_data[1],
},
};
-#endif
/*
* Board init
@@ -172,12 +168,10 @@ static void __init mx1ads_init(void)
mxc_register_device(&flash_device, &mx1ads_flash_data);
/* I2C */
-#ifdef CONFIG_I2C_IMX
i2c_register_board_info(0, mx1ads_i2c_devices,
ARRAY_SIZE(mx1ads_i2c_devices));
mxc_register_device(&imx_i2c_device, &mx1ads_i2c_data);
-#endif
}
static void __init mx1ads_timer_init(void)