diff --git a/[refs] b/[refs]
index b33dc7686f60..8a5cc5370300 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ebf0232f8eaeb8008314bb408f9c2818de41106
+refs/heads/master: d022bbc712eb1fc53fbbec27a9f0ae07f55f9b65
diff --git a/trunk/drivers/of/fdt.c b/trunk/drivers/of/fdt.c
index ea2bd1be2640..91a375fb6ae6 100644
--- a/trunk/drivers/of/fdt.c
+++ b/trunk/drivers/of/fdt.c
@@ -23,7 +23,6 @@
 #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)