diff --git a/[refs] b/[refs]
index d7254ccefb78..4721e5126ef9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c939402e43b21ea8ac031b7f751fa0c6b0faf00
+refs/heads/master: eb52d5801302a3515506891c13338fbaa7222f36
diff --git a/trunk/drivers/of/fdt.c b/trunk/drivers/of/fdt.c
index 91a375fb6ae6..ea2bd1be2640 100644
--- a/trunk/drivers/of/fdt.c
+++ b/trunk/drivers/of/fdt.c
@@ -23,6 +23,7 @@
 #include <asm/machdep.h>
 #endif /* CONFIG_PPC */
 
+#include <asm/setup.h>
 #include <asm/page.h>
 
 char *of_fdt_get_string(struct boot_param_header *blob, u32 offset)