From 8c7ae8ae39c7e04f30f6a537439c72a46d0a55d5 Mon Sep 17 00:00:00 2001
From: root <root@rockchip-MID.(none)>
Date: Wed, 11 May 2011 11:00:41 +0800
Subject: [PATCH] xxm FIH:config bq27510 && update rk29_FIH_defconfig

---
 arch/arm/configs/rk29_FIH_defconfig |  4 ++--
 arch/arm/mach-rk29/board-rk29-fih.c | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/arm/configs/rk29_FIH_defconfig b/arch/arm/configs/rk29_FIH_defconfig
index 7cfeb6e78680..4f4b3d3dba51 100644
--- a/arch/arm/configs/rk29_FIH_defconfig
+++ b/arch/arm/configs/rk29_FIH_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32.27
-# Sat May  7 10:51:04 2011
+# Wed May 11 10:45:06 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1040,7 +1040,7 @@ CONFIG_POWER_SUPPLY=y
 CONFIG_BATTERY_BQ27510=y
 # CONFIG_BATTERY_BQ3060 is not set
 # CONFIG_CHECK_BATT_CAPACITY is not set
-CONFIG_NO_BATTERY_IC=y
+# CONFIG_NO_BATTERY_IC is not set
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
 # CONFIG_WATCHDOG is not set
diff --git a/arch/arm/mach-rk29/board-rk29-fih.c b/arch/arm/mach-rk29/board-rk29-fih.c
index 5e65d3ace8fe..5e04b85e8f39 100755
--- a/arch/arm/mach-rk29/board-rk29-fih.c
+++ b/arch/arm/mach-rk29/board-rk29-fih.c
@@ -1016,14 +1016,6 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
 		.flags			= 0,
 	},
 #endif
-#if defined (CONFIG_BATTERY_BQ27510)
-	{
-		.type    		= "bq27510",
-		.addr           = 0x55,
-		.flags			= 0,
-		.platform_data  = &bq27510_info,
-	},
-#endif
 #if defined (CONFIG_RTC_HYM8563)
 	{
 		.type    		= "rtc_hym8563",
@@ -1130,6 +1122,14 @@ static struct i2c_board_info __initdata board_i2c2_devices[] = {
         .platform_data  = &rk29_tps65910_data,
 	},
 #endif
+#if defined (CONFIG_BATTERY_BQ27510)
+{
+	.type    		= "bq27510",
+	.addr           = 0x55,
+	.flags			= 0,
+	.platform_data  = &bq27510_info,
+},
+#endif
 };
 #endif
 
-- 
2.34.1