diff options
| author | Will Deacon <will.deacon@arm.com> | 2015-08-05 15:14:06 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-08-05 15:14:06 +0200 |
| commit | d422e62562e0dcef0ace4cd4fc4b4519d0a55ab4 (patch) | |
| tree | a4769135920d8ec4ded9569f89c231130980ba42 /arch/arm64/Kconfig | |
| parent | arm64: mm: ensure patched kernel text is fetched from PoU (diff) | |
| parent | MAINTAINERS: add PSCI entry (diff) | |
| download | linux-d422e62562e0dcef0ace4cd4fc4b4519d0a55ab4.tar.xz linux-d422e62562e0dcef0ace4cd4fc4b4519d0a55ab4.zip | |
Merge branch 'aarch64/psci/drivers' into aarch64/for-next/core
Move our PSCI implementation out into drivers/firmware/ where it can be
shared with arch/arm/.
Conflicts:
arch/arm64/kernel/psci.c
Diffstat (limited to 'arch/arm64/Kconfig')
| -rw-r--r-- | arch/arm64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 371a987b3c11..78b89fa337ee 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -20,6 +20,7 @@ config ARM64 select ARM_GIC_V2M if PCI_MSI select ARM_GIC_V3 select ARM_GIC_V3_ITS if PCI_MSI + select ARM_PSCI_FW select BUILDTIME_EXTABLE_SORT select CLONE_BACKWARDS select COMMON_CLK |