Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / arch / arm / mach-omap2 / devices.c

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 52ec2f2d636022300709012b263f623b7dfc2ab5..b603bc5f8e5bad9f30314cad01ec92e77126ca60 100644 (file)
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -55,8 +55,10 @@ static void omap_init_i2c(void)
        if (machine_is_omap_h4())
                return;
 
-       omap_cfg_reg(J15_24XX_I2C2_SCL);
-       omap_cfg_reg(H19_24XX_I2C2_SDA);
+       if (!cpu_is_omap2430()) {
+               omap_cfg_reg(J15_24XX_I2C2_SCL);
+               omap_cfg_reg(H19_24XX_I2C2_SDA);
+       }
        (void) platform_device_register(&omap_i2c_device2);
 }