diff options
| author | Will Deacon <will.deacon@arm.com> | 2015-08-05 13:14:06 (GMT) |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-08-05 13:14:06 (GMT) |
| commit | d422e62562e0dcef0ace4cd4fc4b4519d0a55ab4 (patch) | |
| tree | a4769135920d8ec4ded9569f89c231130980ba42 /arch/arm64/kernel/setup.c | |
| parent | 8ec41987436d566f7c4559c6871738b869f7ef07 (diff) | |
| parent | 514f161abcda065914f7ea8954c815eee98074a5 (diff) | |
| download | linux-d422e62562e0dcef0ace4cd4fc4b4519d0a55ab4.tar.xz | |
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/kernel/setup.c')
| -rw-r--r-- | arch/arm64/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 0c8fd97..fddae2c 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -46,6 +46,7 @@ #include <linux/of_platform.h> #include <linux/efi.h> #include <linux/personality.h> +#include <linux/psci.h> #include <asm/acpi.h> #include <asm/fixmap.h> @@ -61,7 +62,6 @@ #include <asm/tlbflush.h> #include <asm/traps.h> #include <asm/memblock.h> -#include <asm/psci.h> #include <asm/efi.h> #include <asm/xen/hypervisor.h> |