aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/include/asm/prom.h1
-rw-r--r--drivers/of/fdt.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/prom.h b/arch/arm/include/asm/prom.h
index 6f65ca86a5ec..ee0363307918 100644
--- a/arch/arm/include/asm/prom.h
+++ b/arch/arm/include/asm/prom.h
@@ -13,7 +13,6 @@
13 13
14#ifdef CONFIG_OF 14#ifdef CONFIG_OF
15 15
16#include <asm/setup.h>
17#include <asm/irq.h> 16#include <asm/irq.h>
18 17
19extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys); 18extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 7dc8e6da858d..91a375fb6ae6 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -18,6 +18,7 @@
18#include <linux/errno.h> 18#include <linux/errno.h>
19#include <linux/slab.h> 19#include <linux/slab.h>
20 20
21#include <asm/setup.h> /* for COMMAND_LINE_SIZE */
21#ifdef CONFIG_PPC 22#ifdef CONFIG_PPC
22#include <asm/machdep.h> 23#include <asm/machdep.h>
23#endif /* CONFIG_PPC */ 24#endif /* CONFIG_PPC */