diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-09-20 14:58:59 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-09-20 14:58:59 (GMT) |
commit | 41a66072c32978ff3914fd6be88f7592ef64bef7 (patch) | |
tree | 0f38ef433f0feea3e58f61f8d5397cd9bf065559 /arch/powerpc/platforms/pseries/setup.c | |
parent | 5465fe0fc3316f7cdda66732a7986f4ebe76d949 (diff) | |
parent | 7597cdc066313bfd211cca2f9252dfeb41271391 (diff) | |
download | linux-41a66072c32978ff3914fd6be88f7592ef64bef7.tar.xz |
Merge branch 'efi/urgent' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc/platforms/pseries/setup.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 4ffcaa6..a39d20e 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -41,7 +41,6 @@ #include <linux/root_dev.h> #include <linux/of.h> #include <linux/of_pci.h> -#include <linux/kexec.h> #include <asm/mmu.h> #include <asm/processor.h> @@ -66,6 +65,7 @@ #include <asm/eeh.h> #include <asm/reg.h> #include <asm/plpar_wrappers.h> +#include <asm/kexec.h> #include "pseries.h" |