summaryrefslogtreecommitdiff
path: root/drivers/power/Makefile
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2013-01-25 19:30:00 +0400
committerAnton Vorontsov <anton@enomsg.org>2013-02-03 07:06:34 +0400
commit84d7b768748943db2bb658b43931fdab04c224cc (patch)
tree8fc3e930ba86848187820d89157fa88ec80f946b /drivers/power/Makefile
parent8fd526fd18233887ba652079a369f4eee0de9d9d (diff)
downloadlinux-84d7b768748943db2bb658b43931fdab04c224cc.tar.xz
power: Add battery driver for goldfish emulator
Add the emulated power driver for the Goldfish platform. This folds together the code from the Google tree, Jun Nakajima's cleanups and x86 porting work, and then a tidy up to pass checkpatch. Signed-off-by: Mike A. Chan <mikechan@google.com> [cleanup and x86 support] Signed-off-by: Sheng Yang <sheng@linux.intel.com> Signed-off-by: Yunhong Jiang <yunhong.jiang@intel.com> Signed-off-by: Xiaohui Xin <xiaohui.xin@intel.com> Signed-off-by: Jun Nakajima <jun.nakajima@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> [ported to 3.4] Signed-off-by: Tom Keel <thomas.keel@intel.com> [ported to 3.7 and final tidy] Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Diffstat (limited to 'drivers/power/Makefile')
-rw-r--r--drivers/power/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index b11e0c7ea0f1..a9f5c06ad41a 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -20,6 +20,7 @@ obj-$(CONFIG_BATTERY_DS2760) += ds2760_battery.o
obj-$(CONFIG_BATTERY_DS2780) += ds2780_battery.o
obj-$(CONFIG_BATTERY_DS2781) += ds2781_battery.o
obj-$(CONFIG_BATTERY_DS2782) += ds2782_battery.o
+obj-$(CONFIG_BATTERY_GOLDFISH) += goldfish_battery.o
obj-$(CONFIG_BATTERY_PMU) += pmu_battery.o
obj-$(CONFIG_BATTERY_OLPC) += olpc_battery.o
obj-$(CONFIG_BATTERY_TOSA) += tosa_battery.o