diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-06-26 06:55:23 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-06-26 06:55:23 -0700 |
| commit | 9e74f218abd04dfa082391672295ecc1a3654845 (patch) | |
| tree | d668104b1021bcc737b5fadc7992f45a4c638705 /drivers/power/Kconfig | |
| parent | b955eefc46a6923424cbede2f8ab76c8f5acf056 (diff) | |
| parent | 21ff63ad131218048525fbd37d065ce61f03bcbd (diff) | |
Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-driver
Diffstat (limited to 'drivers/power/Kconfig')
| -rw-r--r-- | drivers/power/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index e3a3b4956f0..70b4a979a6f 100644 --- 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" |