Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / power / Kconfig

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index e3a3b4956f08408741fe5856a562b8defe7294a1..70b4a979a6fff01fbef9bd29ba7cd5982cd3a1d3 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"