aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2009-10-06 03:12:17 +0000
committerNicolas Thill <nico@openwrt.org>2009-10-06 03:12:17 +0000
commit4c7f1e60a03e14572ea9ff5219df3f86d4b4a6dd (patch)
tree8a9caf09700608b785ef6ac40ab585c59999cc9e /target
parent7efc6ff0dcb3ab7ff206b3fd245f73187e1fb824 (diff)
downloadupstream-4c7f1e60a03e14572ea9ff5219df3f86d4b4a6dd.tar.gz
upstream-4c7f1e60a03e14572ea9ff5219df3f86d4b4a6dd.tar.bz2
upstream-4c7f1e60a03e14572ea9ff5219df3f86d4b4a6dd.zip
[kernel] move common CONFIG_BATTERY entries to generic
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17945 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic-2.6/config-2.6.272
-rw-r--r--target/linux/generic-2.6/config-2.6.305
-rw-r--r--target/linux/generic-2.6/config-2.6.315
-rw-r--r--target/linux/goldfish/config-2.6.301
-rw-r--r--target/linux/olpc/config-2.6.271
-rw-r--r--target/linux/olpc/config-2.6.301
-rw-r--r--target/linux/s3c24xx/config-2.6.302
-rw-r--r--target/linux/s3c24xx/config-2.6.314
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 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