projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
power
/
Kconfig
diff --git
a/drivers/power/Kconfig
b/drivers/power/Kconfig
index
e3a3b49
..
70b4a97
100644
(file)
--- a/
drivers/power/Kconfig
+++ b/
drivers/power/Kconfig
@@
-310,3
+310,5
@@
config AB8500_BATTERY_THERM_ON_BATCTRL
Say Y to enable battery temperature measurements using
thermistor connected on BATCTRL ADC.
endif # POWER_SUPPLY
+
+source "drivers/power/avs/Kconfig"