From: Danny Kukawka <danny.kukawka@bisect.de>
Date: Wed, 15 Feb 2012 17:55:28 +0000 (+0100)
Subject: of/fdt.c: asm/setup.h included twice
X-Git-Tag: v3.3-rc7~14^2^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d022bbc712eb1fc53fbbec27a9f0ae07f55f9b65;p=karo-tx-linux.git

of/fdt.c: asm/setup.h included twice

drivers/of/fdt.c included 'asm/setup.h' twice, remove the duplicate.

Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index ea2bd1be2640..91a375fb6ae6 100644
--- 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)