ARM i.MX35 pcm043: remove unnecessary CONFIG_I2C ifdefs
authorSascha Hauer <s.hauer@pengutronix.de>
Fri, 14 Jan 2011 10:18:02 +0000 (11:18 +0100)
committerSascha Hauer <s.hauer@pengutronix.de>
Thu, 27 Jan 2011 11:51:13 +0000 (12:51 +0100)
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
arch/arm/mach-mx3/mach-pcm043.c

index bcf83fc7e701eeb26b618017ef5cd8ccf412b7a4..a27022d15c27c36bcd292b4889d8170a4b751f0b 100644 (file)
@@ -115,7 +115,6 @@ static const struct imxuart_platform_data uart_pdata __initconst = {
        .flags = IMXUART_HAVE_RTSCTS,
 };
 
-#if defined CONFIG_I2C_IMX || defined CONFIG_I2C_IMX_MODULE
 static const struct imxi2c_platform_data pcm043_i2c0_data __initconst = {
        .bitrate = 50000,
 };
@@ -134,7 +133,6 @@ static struct i2c_board_info pcm043_i2c_devices[] = {
                I2C_BOARD_INFO("pcf8563", 0x51),
        }
 };
-#endif
 
 static struct platform_device *devices[] __initdata = {
        &pcm043_flash,
@@ -369,12 +367,10 @@ static void __init mxc_board_init(void)
 
        imx35_add_imx_uart1(&uart_pdata);
 
-#if defined CONFIG_I2C_IMX || defined CONFIG_I2C_IMX_MODULE
        i2c_register_board_info(0, pcm043_i2c_devices,
                        ARRAY_SIZE(pcm043_i2c_devices));
 
        imx35_add_imx_i2c0(&pcm043_i2c0_data);
-#endif
 
        mxc_register_device(&mx3_ipu, &mx3_ipu_data);
        mxc_register_device(&mx3_fb, &mx3fb_pdata);