diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-13 01:49:29 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-13 01:49:29 +0300 |
| commit | cc49e8c9e66d4c52b121de0da666393c4140c0f2 (patch) | |
| tree | bf213afb91e09dbba66a5b51c5312b423e675884 /drivers/power/reset/Kconfig | |
| parent | 4cfceaf0c087f47033f5e61a801f4136d6fb68c6 (diff) | |
| parent | 8ebb7e9c1a502cfc300618c19c3c6f06fc76d237 (diff) | |
| download | linux-cc49e8c9e66d4c52b121de0da666393c4140c0f2.tar.xz | |
Merge tag 'for-v4.1-rc' of git://git.infradead.org/battery-2.6
Pull power supply and reset fixes from Sebastian Reichel:
"misc fixes"
* tag 'for-v4.1-rc' of git://git.infradead.org/battery-2.6:
power: bq27x00_battery: Add missing MODULE_ALIAS
power: reset: Add MFD_SYSCON depends for brcmstb
power: reset: ltc2952: Remove bogus hrtimer_start() return value checks
power_supply: fix oops in collie_battery driver
power/reset: at91: fix return value check in at91_reset_platform_probe()
MAINTAINERS: Add me as maintainer of Nokia N900 power supply drivers
axp288_fuel_gauge: Add original author details
Diffstat (limited to 'drivers/power/reset/Kconfig')
| -rw-r--r-- | drivers/power/reset/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig index aad9c3318c02..17d93a73c513 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -41,6 +41,7 @@ config POWER_RESET_AXXIA config POWER_RESET_BRCMSTB bool "Broadcom STB reset driver" depends on ARM || MIPS || COMPILE_TEST + depends on MFD_SYSCON default ARCH_BRCMSTB help This driver provides restart support for Broadcom STB boards. |