diff --git a/[refs] b/[refs]
index 48b9688ae87d..f88d4c8f8ac4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93797d87d63d36404907640e4e20bb976bff4744
+refs/heads/master: c89810acbcf48c7004e912b2b4b862480b2d00e1
diff --git a/trunk/arch/arm/include/asm/prom.h b/trunk/arch/arm/include/asm/prom.h
index 6f65ca86a5ec..ee0363307918 100644
--- a/trunk/arch/arm/include/asm/prom.h
+++ b/trunk/arch/arm/include/asm/prom.h
@@ -13,7 +13,6 @@
 
 #ifdef CONFIG_OF
 
-#include <asm/setup.h>
 #include <asm/irq.h>
 
 extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
diff --git a/trunk/drivers/of/fdt.c b/trunk/drivers/of/fdt.c
index 7dc8e6da858d..91a375fb6ae6 100644
--- a/trunk/drivers/of/fdt.c
+++ b/trunk/drivers/of/fdt.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 
+#include <asm/setup.h>  /* for COMMAND_LINE_SIZE */
 #ifdef CONFIG_PPC
 #include <asm/machdep.h>
 #endif /* CONFIG_PPC */