From c1e1f2cd55ec8a054b97ade6af3ea8412ddde72b Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E9=BB=84=E6=B6=9B?= <huangtao@rock-chips.com>
Date: Fri, 30 Mar 2012 19:55:53 +0800
Subject: [PATCH] i2c: fix rk change for i2c gpio

---
 drivers/i2c/algos/Makefile  | 3 +--
 drivers/i2c/busses/Kconfig  | 4 ++++
 drivers/i2c/busses/Makefile | 1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/i2c/algos/Makefile b/drivers/i2c/algos/Makefile
index 6a15fa1e1318..215303f60d61 100644
--- a/drivers/i2c/algos/Makefile
+++ b/drivers/i2c/algos/Makefile
@@ -2,8 +2,7 @@
 # Makefile for the i2c algorithms
 #
 
-#obj-$(CONFIG_I2C_ALGOBIT)	+= i2c-algo-bit.o
-obj-y						+= i2c-algo-bit.o
+obj-$(CONFIG_I2C_ALGOBIT)	+= i2c-algo-bit.o
 obj-$(CONFIG_I2C_ALGOPCF)	+= i2c-algo-pcf.o
 obj-$(CONFIG_I2C_ALGOPCA)	+= i2c-algo-pca.o
 
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 2d7e414c4070..8c8b36f2b216 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -942,6 +942,7 @@ if I2C_RK29
 				config RK29_I2C0_CONTROLLER
 					bool "With i2c controller"
 				config RK29_I2C0_GPIO
+					select I2C_GPIO
 					bool "Simulation with GPIO"
 			endchoice
 		endif
@@ -957,6 +958,7 @@ if I2C_RK29
 				config RK29_I2C1_CONTROLLER
 					bool "With i2c controller"
 				config RK29_I2C1_GPIO
+					select I2C_GPIO
 					bool "Simulation with GPIO"
 			endchoice
 		endif
@@ -973,6 +975,7 @@ if I2C_RK29
 				config RK29_I2C2_CONTROLLER
 					bool "With i2c controller"
 				config RK29_I2C2_GPIO
+					select I2C_GPIO
 					bool "Simulation with GPIO"
 			endchoice
 		endif
@@ -989,6 +992,7 @@ if I2C_RK29
 				config RK29_I2C3_CONTROLLER
 					bool "With i2c controller"
 				config RK29_I2C3_GPIO
+					select I2C_GPIO
 					bool "Simulation with GPIO"
 			endchoice
 		endif
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index 3948ba06a19c..7a0151b443c7 100644
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -4,7 +4,6 @@
 obj-$(CONFIG_I2C_RK29)		+= i2c-rk29.o
 obj-$(CONFIG_I2C_DEV_RK29)	+= i2c-dev-rk29.o
 obj-$(CONFIG_I2C_RK30)		+= i2c-rk30.o i2c-rk29-adapter.o i2c-rk30-adapter.o i2c-rk30-test.o
-obj-y				+= i2c-gpio.o
 
 # ACPI drivers
 obj-$(CONFIG_I2C_SCMI)		+= i2c-scmi.o
-- 
2.34.1