aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/xburst/patches-2.6.32/100-battery.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-01-28 11:54:20 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-01-28 11:54:20 +0000
commit6ff3e61cf7d3d88eaa57304847d625197423012e (patch)
treeca95e5648c088907f4585d155bad0f0b4618f649 /target/linux/xburst/patches-2.6.32/100-battery.patch
parentb5bc4523087c81a5f36fdc5ecec36788ee62b9ba (diff)
downloadupstream-6ff3e61cf7d3d88eaa57304847d625197423012e.tar.gz
upstream-6ff3e61cf7d3d88eaa57304847d625197423012e.tar.bz2
upstream-6ff3e61cf7d3d88eaa57304847d625197423012e.zip
kernel: update to 2.6.32.6
SVN-Revision: 19358
Diffstat (limited to 'target/linux/xburst/patches-2.6.32/100-battery.patch')
-rw-r--r--target/linux/xburst/patches-2.6.32/100-battery.patch9
1 files changed, 1 insertions, 8 deletions
diff --git a/target/linux/xburst/patches-2.6.32/100-battery.patch b/target/linux/xburst/patches-2.6.32/100-battery.patch
index 5885839261..105afc22eb 100644
--- a/target/linux/xburst/patches-2.6.32/100-battery.patch
+++ b/target/linux/xburst/patches-2.6.32/100-battery.patch
@@ -8,8 +8,6 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/100-ba
drivers/power/Makefile | 1 +
2 files changed, 12 insertions(+), 0 deletions(-)
-diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
-index cea6cef..f10934e 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -110,4 +110,15 @@ config CHARGER_PCF50633
@@ -28,15 +26,10 @@ index cea6cef..f10934e 100644
+ called jz4740-battery.
+
endif # POWER_SUPPLY
-diff --git a/drivers/power/Makefile b/drivers/power/Makefile
-index b96f29d..664d589 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
-@@ -29,3 +29,4 @@ obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o
+@@ -29,3 +29,4 @@ obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00
obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o
obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o
obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o
+obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o
---
-1.5.6.5
-