summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2013-09-09 18:13:22 -0500
committerRob Herring <rob.herring@calxeda.com>2013-10-09 20:04:06 -0500
commitba904f0649357a3cbd67e752d30898c42b1fc91a (patch)
treed2fed7ac153417624c9add98891fd5f3dda475fc /arch
parent089a49b68ce9bfe078d509d96c78a94e5f865ca9 (diff)
downloadlinux-ba904f0649357a3cbd67e752d30898c42b1fc91a.tar.gz
linux-ba904f0649357a3cbd67e752d30898c42b1fc91a.tar.bz2
linux-ba904f0649357a3cbd67e752d30898c42b1fc91a.zip
x86: add necessary includes for prom.h
Once prom.h is no longer implicitly included, we need to include setup.h to get COMMAND_LINE_SIZE. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Grant Likely <grant.likely@linaro.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: x86@kernel.org
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/devicetree.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index 0e1f95b06336..679d676a30d7 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -20,6 +20,7 @@
#include <asm/hpet.h>
#include <asm/apic.h>
#include <asm/pci_x86.h>
+#include <asm/setup.h>
__initdata u64 initial_dtb;
char __initdata cmd_line[COMMAND_LINE_SIZE];