Merge branch 'akpm' (Andrew's patch-bomb)

[~andy/linux] / drivers / of / fdt.c

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index ea2bd1be26404092585dcb4d20b0ab113a808ab7..91a375fb6ae622181231fce19b1a5907e94c9f40 100644 (file)
--- a/drivers/of/fdt.c
+++ b/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)