diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-18 16:46:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-18 16:46:29 +0100 |
| commit | 9bca3d7f7c5865700303e8bce0eac57bab76bcc7 (patch) | |
| tree | 2e31b6d77ab5d206e5cada5590100150774cf3f9 /drivers/power | |
| parent | 38b52683569174d95efcb60edfb4985be0e023b5 (diff) | |
| parent | dc2ed0827570f07ab496e9742d48eaaac07e4ff8 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/tc2' into linux-linaro-lsk
Conflicts (look like simple add/add stuff):
arch/arm/Kconfig
arch/arm/common/Makefile
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/reset/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig index 349e9ae8090..ee039dcead0 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -32,7 +32,8 @@ config POWER_RESET_RESTART user presses a key. u-boot then boots into Linux. config POWER_RESET_VEXPRESS - bool + bool "ARM Versatile Express power-off and reset driver" + depends on ARM || ARM64 depends on POWER_RESET help Power off and reset support for the ARM Ltd. Versatile |