diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2012-01-04 00:09:35 -0500 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2012-01-04 00:09:35 -0500 |
| commit | 251f39fe42dae863bd24e30864e6b66076ba076d (patch) | |
| tree | c804944bc17f3836d19cc8b5bc611dd1fb0ea915 /drivers/power/Kconfig | |
| parent | 9b8872273af6983b246252a6508fa7cf34c69d6e (diff) | |
| parent | 35b4c01e29bdd9632dabf9784ed3486333f00427 (diff) | |
Merge branch 'power-supply-scope' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
Diffstat (limited to 'drivers/power/Kconfig')
| -rw-r--r-- | drivers/power/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index ac807c4fda57..3bd2ed86fea2 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig | |||
| @@ -70,6 +70,7 @@ config BATTERY_DS2760 | |||
| 70 | 70 | ||
| 71 | config BATTERY_DS2780 | 71 | config BATTERY_DS2780 |
| 72 | tristate "DS2780 battery driver" | 72 | tristate "DS2780 battery driver" |
| 73 | depends on HAS_IOMEM | ||
| 73 | select W1 | 74 | select W1 |
| 74 | select W1_SLAVE_DS2780 | 75 | select W1_SLAVE_DS2780 |
| 75 | help | 76 | help |