Merge xburst target.
[openwrt/staging/florian.git] / target / linux / xburst / patches-2.6.32 / 100-battery.patch
1 From 045c37b75e13fe84f582627f7e2f68b7fa194909 Mon Sep 17 00:00:00 2001
2 From: Lars-Peter Clausen <lars@metafoo.de>
3 Date: Mon, 11 Jan 2010 04:29:41 +0100
4 Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/100-battery.patch
5
6 ---
7 drivers/power/Kconfig | 11 +++++++++++
8 drivers/power/Makefile | 1 +
9 2 files changed, 12 insertions(+), 0 deletions(-)
10
11 diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
12 index cea6cef..f10934e 100644
13 --- a/drivers/power/Kconfig
14 +++ b/drivers/power/Kconfig
15 @@ -110,4 +110,15 @@ config CHARGER_PCF50633
16 help
17 Say Y to include support for NXP PCF50633 Main Battery Charger.
18
19 +config BATTERY_JZ4740
20 + tristate "Ingenic JZ4720/JZ4740 battery"
21 + depends on SOC_JZ4740
22 + depends on JZ4740_ADC
23 + help
24 + Say Y to enable support for the battery on Ingenic JZ4720/JZ4740 based
25 + boards.
26 +
27 + This driver can be build as a module. If so, the module will be
28 + called jz4740-battery.
29 +
30 endif # POWER_SUPPLY
31 diff --git a/drivers/power/Makefile b/drivers/power/Makefile
32 index b96f29d..664d589 100644
33 --- a/drivers/power/Makefile
34 +++ b/drivers/power/Makefile
35 @@ -29,3 +29,4 @@ obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o
36 obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o
37 obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o
38 obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o
39 +obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o
40 --
41 1.5.6.5
42