Remove <common.h> from all mach-davinci files and when needed add missing include files directly.
Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/include/asm/ti-common/davinci_nand.h | 1 + arch/arm/mach-davinci/cpu.c | 3 ++- arch/arm/mach-davinci/da850_lowlevel.c | 2 +- arch/arm/mach-davinci/da850_pinmux.c | 1 - arch/arm/mach-davinci/include/mach/davinci_misc.h | 1 + arch/arm/mach-davinci/misc.c | 3 ++- arch/arm/mach-davinci/pinmux.c | 1 - arch/arm/mach-davinci/psc.c | 1 - arch/arm/mach-davinci/reset.c | 1 - arch/arm/mach-davinci/spl.c | 1 - arch/arm/mach-davinci/timer.c | 2 +- 11 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/arch/arm/include/asm/ti-common/davinci_nand.h b/arch/arm/include/asm/ti-common/davinci_nand.h index 38a1a6ea0d7b..84fe01e3b712 100644 --- a/arch/arm/include/asm/ti-common/davinci_nand.h +++ b/arch/arm/include/asm/ti-common/davinci_nand.h @@ -9,6 +9,7 @@ #ifndef _DAVINCI_NAND_H_ #define _DAVINCI_NAND_H_
+#include <config.h> #include <asm/arch/hardware.h>
#define NAND_READ_START 0x00 diff --git a/arch/arm/mach-davinci/cpu.c b/arch/arm/mach-davinci/cpu.c index dae60262f5b7..033411235391 100644 --- a/arch/arm/mach-davinci/cpu.c +++ b/arch/arm/mach-davinci/cpu.c @@ -4,11 +4,12 @@ * Copyright (C) 2009 David Brownell */
-#include <common.h> +#include <config.h> #include <clock_legacy.h> #include <init.h> #include <asm/arch/hardware.h> #include <asm/global_data.h> +#include <asm/u-boot.h> #include <asm/io.h>
DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/mach-davinci/da850_lowlevel.c b/arch/arm/mach-davinci/da850_lowlevel.c index 08c8f5925243..936b5e116679 100644 --- a/arch/arm/mach-davinci/da850_lowlevel.c +++ b/arch/arm/mach-davinci/da850_lowlevel.c @@ -5,7 +5,7 @@ * Copyright (C) 2011 * Heiko Schocher, DENX Software Engineering, hs@denx.de. */ -#include <common.h> +#include <config.h> #include <init.h> #include <nand.h> #include <ns16550.h> diff --git a/arch/arm/mach-davinci/da850_pinmux.c b/arch/arm/mach-davinci/da850_pinmux.c index f2536c8dd6d6..4ee3cd0d5b34 100644 --- a/arch/arm/mach-davinci/da850_pinmux.c +++ b/arch/arm/mach-davinci/da850_pinmux.c @@ -5,7 +5,6 @@ * Copyright (C) 2011 OMICRON electronics GmbH */
-#include <common.h> #include <asm/arch/davinci_misc.h> #include <asm/arch/hardware.h> #include <asm/arch/pinmux_defs.h> diff --git a/arch/arm/mach-davinci/include/mach/davinci_misc.h b/arch/arm/mach-davinci/include/mach/davinci_misc.h index 1133a23bdee3..0d0ad1e593e1 100644 --- a/arch/arm/mach-davinci/include/mach/davinci_misc.h +++ b/arch/arm/mach-davinci/include/mach/davinci_misc.h @@ -6,6 +6,7 @@ #ifndef __MISC_H #define __MISC_H
+#include <linux/types.h> #include <asm/arch/hardware.h>
/* pin muxer definitions */ diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c index cfad28c43d0a..93a144757a9e 100644 --- a/arch/arm/mach-davinci/misc.c +++ b/arch/arm/mach-davinci/misc.c @@ -8,7 +8,7 @@ * Copyright (C) 2004 Texas Instruments. */
-#include <common.h> +#include <config.h> #include <env.h> #include <i2c.h> #include <init.h> @@ -16,6 +16,7 @@ #include <net.h> #include <asm/arch/hardware.h> #include <asm/global_data.h> +#include <asm/u-boot.h> #include <asm/io.h> #include <asm/arch/davinci_misc.h>
diff --git a/arch/arm/mach-davinci/pinmux.c b/arch/arm/mach-davinci/pinmux.c index 7904257b4a42..5ecb434b03b6 100644 --- a/arch/arm/mach-davinci/pinmux.c +++ b/arch/arm/mach-davinci/pinmux.c @@ -8,7 +8,6 @@ * Copyright (C) 2004 Texas Instruments. */
-#include <common.h> #include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/arch/davinci_misc.h> diff --git a/arch/arm/mach-davinci/psc.c b/arch/arm/mach-davinci/psc.c index dae10aa03bbb..90b817860a62 100644 --- a/arch/arm/mach-davinci/psc.c +++ b/arch/arm/mach-davinci/psc.c @@ -7,7 +7,6 @@ * Copyright (C) 2004 Texas Instruments. */
-#include <common.h> #include <asm/arch/hardware.h> #include <asm/io.h>
diff --git a/arch/arm/mach-davinci/reset.c b/arch/arm/mach-davinci/reset.c index 0d59eb6e3cef..e3e2c56a6760 100644 --- a/arch/arm/mach-davinci/reset.c +++ b/arch/arm/mach-davinci/reset.c @@ -6,7 +6,6 @@ * Copyright (C) 2007 Sergey Kubushyn ksi@koi8.net */
-#include <common.h> #include <cpu_func.h> #include <asm/io.h> #include <asm/arch/timer_defs.h> diff --git a/arch/arm/mach-davinci/spl.c b/arch/arm/mach-davinci/spl.c index 5f5b9ebbf97a..4603c8fbc575 100644 --- a/arch/arm/mach-davinci/spl.c +++ b/arch/arm/mach-davinci/spl.c @@ -3,7 +3,6 @@ * Copyright (C) 2011 * Heiko Schocher, DENX Software Engineering, hs@denx.de. */ -#include <common.h> #include <config.h> #include <hang.h> #include <init.h> diff --git a/arch/arm/mach-davinci/timer.c b/arch/arm/mach-davinci/timer.c index 83c190b620e7..f2990f718773 100644 --- a/arch/arm/mach-davinci/timer.c +++ b/arch/arm/mach-davinci/timer.c @@ -20,7 +20,7 @@ * Copyright (C) 2007 Sergey Kubushyn ksi@koi8.net */
-#include <common.h> +#include <config.h> #include <init.h> #include <time.h> #include <asm/global_data.h>