From 2556fbb0cd81ce19a6a5ac49425eee14efb7a1ab Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Tue, 6 Oct 2009 03:12:17 +0000
Subject: [PATCH] move common CONFIG_BATTERY entries to generic

SVN-Revision: 17945
---
 target/linux/generic-2.6/config-2.6.27 | 2 ++
 target/linux/generic-2.6/config-2.6.30 | 5 +++++
 target/linux/generic-2.6/config-2.6.31 | 5 +++++
 target/linux/goldfish/config-2.6.30    | 1 -
 target/linux/olpc/config-2.6.27        | 1 -
 target/linux/olpc/config-2.6.30        | 1 -
 target/linux/s3c24xx/config-2.6.30     | 2 --
 target/linux/s3c24xx/config-2.6.31     | 4 ----
 8 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/target/linux/generic-2.6/config-2.6.27 b/target/linux/generic-2.6/config-2.6.27
index e70a735532fc..8d9eb4abae48 100644
--- a/target/linux/generic-2.6/config-2.6.27
+++ b/target/linux/generic-2.6/config-2.6.27
@@ -108,6 +108,8 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_BASE_FULL=y
 # CONFIG_BASLER_EXCITE is not set
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_OLPC is not set
 # CONFIG_BAYCOM_EPP is not set
 # CONFIG_BAYCOM_PAR is not set
 # CONFIG_BAYCOM_SER_FDX is not set
diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index e362e78b71d5..fdaa764dae0f 100644
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -130,6 +130,11 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_BASE_FULL=y
 # CONFIG_BASLER_EXCITE is not set
+# CONFIG_BATTERY_BQ27000_HDQ is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_OLPC is not set
 # CONFIG_BAYCOM_EPP is not set
 # CONFIG_BAYCOM_PAR is not set
 # CONFIG_BAYCOM_SER_FDX is not set
diff --git a/target/linux/generic-2.6/config-2.6.31 b/target/linux/generic-2.6/config-2.6.31
index fe496ed559df..4a20e4f1ca91 100644
--- a/target/linux/generic-2.6/config-2.6.31
+++ b/target/linux/generic-2.6/config-2.6.31
@@ -125,6 +125,11 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_BASE_FULL=y
 # CONFIG_BASLER_EXCITE is not set
+# CONFIG_BATTERY_BQ27000_HDQ is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BAYCOM_EPP is not set
 # CONFIG_BAYCOM_PAR is not set
 # CONFIG_BAYCOM_SER_FDX is not set
diff --git a/target/linux/goldfish/config-2.6.30 b/target/linux/goldfish/config-2.6.30
index d6b98a683722..7831e75b11b4 100644
--- a/target/linux/goldfish/config-2.6.30
+++ b/target/linux/goldfish/config-2.6.30
@@ -13,7 +13,6 @@ CONFIG_ARM=y
 CONFIG_ARM_THUMB=y
 # CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_BATTERY_DS2760 is not set
 CONFIG_BATTERY_GOLDFISH=y
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y
diff --git a/target/linux/olpc/config-2.6.27 b/target/linux/olpc/config-2.6.27
index f5c18dd4a4c1..f8420458621d 100644
--- a/target/linux/olpc/config-2.6.27
+++ b/target/linux/olpc/config-2.6.27
@@ -54,7 +54,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_BACKLIGHT_PROGEAR is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_BATTERY_DS2760 is not set
 CONFIG_BATTERY_OLPC=y
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_MISC=y
diff --git a/target/linux/olpc/config-2.6.30 b/target/linux/olpc/config-2.6.30
index c1b8e7c893cb..5bedbb50a543 100644
--- a/target/linux/olpc/config-2.6.30
+++ b/target/linux/olpc/config-2.6.30
@@ -51,7 +51,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_BATTERY_DS2760 is not set
 CONFIG_BATTERY_OLPC=y
 CONFIG_BINARY_PRINTF=y
 CONFIG_BINFMT_MISC=y
diff --git a/target/linux/s3c24xx/config-2.6.30 b/target/linux/s3c24xx/config-2.6.30
index e7799df6132d..c2aa2d562b24 100644
--- a/target/linux/s3c24xx/config-2.6.30
+++ b/target/linux/s3c24xx/config-2.6.30
@@ -26,8 +26,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_BACKLIGHT_PWM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_BATTERY_BQ27000_HDQ=y
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_DS2760 is not set
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_RAM=y
diff --git a/target/linux/s3c24xx/config-2.6.31 b/target/linux/s3c24xx/config-2.6.31
index 4dae6708ed13..a4f5bcd58563 100644
--- a/target/linux/s3c24xx/config-2.6.31
+++ b/target/linux/s3c24xx/config-2.6.31
@@ -23,10 +23,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_BACKLIGHT_PWM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_BATTERY_BQ27000_HDQ=y
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_RAM=y
-- 
2.30.2