diff options
| author | Will Deacon <will.deacon@arm.com> | 2015-08-05 09:14:06 -0400 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-08-05 09:14:06 -0400 |
| commit | d422e62562e0dcef0ace4cd4fc4b4519d0a55ab4 (patch) | |
| tree | a4769135920d8ec4ded9569f89c231130980ba42 /arch/arm64/kernel/setup.c | |
| parent | 8ec41987436d566f7c4559c6871738b869f7ef07 (diff) | |
| parent | 514f161abcda065914f7ea8954c815eee98074a5 (diff) | |
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 0c8fd975306b..fddae2c15ad2 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #include <linux/of_platform.h> | 46 | #include <linux/of_platform.h> |
| 47 | #include <linux/efi.h> | 47 | #include <linux/efi.h> |
| 48 | #include <linux/personality.h> | 48 | #include <linux/personality.h> |
| 49 | #include <linux/psci.h> | ||
| 49 | 50 | ||
| 50 | #include <asm/acpi.h> | 51 | #include <asm/acpi.h> |
| 51 | #include <asm/fixmap.h> | 52 | #include <asm/fixmap.h> |
| @@ -61,7 +62,6 @@ | |||
| 61 | #include <asm/tlbflush.h> | 62 | #include <asm/tlbflush.h> |
| 62 | #include <asm/traps.h> | 63 | #include <asm/traps.h> |
| 63 | #include <asm/memblock.h> | 64 | #include <asm/memblock.h> |
| 64 | #include <asm/psci.h> | ||
| 65 | #include <asm/efi.h> | 65 | #include <asm/efi.h> |
| 66 | #include <asm/xen/hypervisor.h> | 66 | #include <asm/xen/hypervisor.h> |
| 67 | 67 | ||