commit 3fa6dd6a7aa7ce1a7d490ef88c2c8ec7db0f196b
author Darius Augulis <augulis.darius@gmail.com> Wed Apr 08 11:15:00 2009 +0300
committer Sascha Hauer <s.hauer@pengutronix.de> Thu Apr 16 12:57:15 2009 +0200
tree 9681f96307a843e84da4d00fb6718587b4bb00bc
parent 248ca85f0135dcb03bc054cd172453b36aad6571

MX1ADS: remove I2C ifdefs

Signed-off-by: Darius Augulis <augulis.darius@gmail.com>

arch/arm/mach-mx1/mx1ads.c

diff --git a/arch/arm/mach-mx1/mx1ads.c b/arch/arm/mach-mx1/mx1ads.c
index 7ae229b..e54057f 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 @@
  * I2C
  */
 
-#ifdef CONFIG_I2C_IMX
 static int i2c_pins[] = {
 	PA15_PF_I2C_SDA,
 	PA16_PF_I2C_SCL,
@@ -157,7 +154,6 @@
 		.platform_data = &pcf857x_data[1],
 	},
 };
-#endif
 
 /*
  * Board init
@@ -172,12 +168,10 @@
 	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)