From: Nicolas Thill <nico@openwrt.org>
Date: Tue, 6 Oct 2009 03:12:17 +0000 (+0000)
Subject: [kernel] move common CONFIG_BATTERY entries to generic
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=ced46c089e322a2d760200c323d955069cc07bf5

[kernel] move common CONFIG_BATTERY entries to generic


SVN-Revision: 17945
---

diff --git a/target/linux/generic-2.6/config-2.6.27 b/target/linux/generic-2.6/config-2.6.27
index e70a735532..8d9eb4abae 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 e362e78b71..fdaa764dae 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 fe496ed559..4a20e4f1ca 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 d6b98a6837..7831e75b11 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 f5c18dd4a4..f842045862 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 c1b8e7c893..5bedbb50a5 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 e7799df613..c2aa2d562b 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 4dae6708ed..a4f5bcd585 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