From 28e096c43a711f1f7f833b4c51afbe82cfa21584 Mon Sep 17 00:00:00 2001 From: Stuart Poulton Date: Thu, 10 May 2012 08:15:44 +0000 Subject: [PATCH] bcm2708: Fix i2c platform device registration when CONFIG_I2C_GPIO=m --- arch/arm/mach-bcm2708/bcm2708.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c index 1f92c7386a6e78..f1134959e05796 100644 --- a/arch/arm/mach-bcm2708/bcm2708.c +++ b/arch/arm/mach-bcm2708/bcm2708.c @@ -378,7 +378,7 @@ static struct platform_device bcm2708_gpio_device = { #endif -#ifdef CONFIG_I2C_GPIO +#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE) /* I2C at the pin header */ static struct i2c_gpio_platform_data bcm2708_i2c_gpio_data0 = { @@ -532,7 +532,7 @@ void __init bcm2708_init(void) bcm_register_device(&bcm2708_emmc_device); #endif bcm2708_init_led(); -#ifdef CONFIG_I2C_GPIO +#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE) bcm_register_device(&bcm2708_i2c_device0); bcm_register_device(&bcm2708_i2c_device1); #endif