diff --git a/[refs] b/[refs] index 6ea49a6f0d56..153e611be818 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc3d7f70c37641ca417f4c02ecaf12cd9772ffa6 +refs/heads/master: 17b7ab80e33dab6b05eaa8332ede8c038fb0d9cb diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 2c3bdce15134..344e299f1257 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -1892,6 +1892,7 @@ config XEN depends on ARM && AEABI && OF depends on CPU_V7 && !CPU_V6 depends on !GENERIC_ATOMIC64 + select ARM_PSCI help Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.