]> err.no Git - linux-2.6/commitdiff
Blackfin arch: fix building for BF542 processors which only have 1 TWI
authorMike Frysinger <michael.frysinger@analog.com>
Wed, 21 Nov 2007 08:03:07 +0000 (16:03 +0800)
committerBryan Wu <bryan.wu@analog.com>
Wed, 21 Nov 2007 08:03:07 +0000 (16:03 +0800)
Signed-off-by: Mike Frysinger <michael.frysinger@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
arch/blackfin/mach-bf548/boards/ezkit.c

index bbd2a046d7c1cee568a581ee63c074ece6c7903b..d37d6653c4bc574da7f80e3aed9161c40f4890c2 100644 (file)
@@ -508,6 +508,7 @@ static struct platform_device i2c_bfin_twi0_device = {
        .resource = bfin_twi0_resource,
 };
 
+#if !defined(CONFIG_BF542)     /* The BF542 only has 1 TWI */
 static struct resource bfin_twi1_resource[] = {
        [0] = {
                .start = TWI1_REGBASE,
@@ -528,6 +529,7 @@ static struct platform_device i2c_bfin_twi1_device = {
        .resource = bfin_twi1_resource,
 };
 #endif
+#endif
 
 static struct platform_device *ezkit_devices[] __initdata = {
 #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
@@ -577,8 +579,10 @@ static struct platform_device *ezkit_devices[] __initdata = {
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
        &i2c_bfin_twi0_device,
+#if !defined(CONFIG_BF542)
        &i2c_bfin_twi1_device,
 #endif
+#endif
 };
 
 static int __init stamp_init(void)