From: kfx <kfx@rock-chips.com>
Date: Fri, 13 Apr 2012 05:52:12 +0000 (+0800)
Subject: rk30: i2c: update i2c gpio driver
X-Git-Tag: firefly_0821_release~9415
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aff4dc147c4dc2b6036722617705fc5718323115;p=firefly-linux-kernel-4.4.55.git

rk30: i2c: update i2c gpio driver
---

diff --git a/arch/arm/mach-rk30/devices.c b/arch/arm/mach-rk30/devices.c
index 2fa28801e199..c0bde30d7651 100755
--- a/arch/arm/mach-rk30/devices.c
+++ b/arch/arm/mach-rk30/devices.c
@@ -523,7 +523,7 @@ static struct platform_device device_i2c4 = {
 #endif
 
 #ifdef CONFIG_I2C_GPIO_RK30
-struct platform_device device_i2c_gpio = {
+static struct platform_device device_i2c_gpio = {
         .name   = "i2c-gpio",
         .id = 5,
         .dev            = {
diff --git a/arch/arm/mach-rk30/include/mach/board.h b/arch/arm/mach-rk30/include/mach/board.h
index 8fd9495712b1..c12d215dddbf 100755
--- a/arch/arm/mach-rk30/include/mach/board.h
+++ b/arch/arm/mach-rk30/include/mach/board.h
@@ -37,9 +37,7 @@ struct wifi_platform_data {
 extern struct rk29_sdmmc_platform_data default_sdmmc0_data;
 extern struct rk29_sdmmc_platform_data default_sdmmc1_data;
 
-#ifdef CONFIG_I2C_ALGOBIT
 extern struct i2c_gpio_platform_data default_i2c_gpio_data; 
-#endif
 
 void __init rk30_map_common_io(void);
 void __init rk30_init_irq(void);