diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-01-30 10:45:33 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-01 21:52:51 +0100 |
commit | 3acf731ccad039d91721b6cd9fc85569e9f958ca (patch) | |
tree | 37ccacb1c2ebc2519d70dab7e48f7d2961cd0195 | |
parent | d8b2823e950cd9634eb4a01f563ee55afb39d549 (diff) | |
download | linux-3acf731ccad039d91721b6cd9fc85569e9f958ca.tar.bz2 |
ARM: davinci: make headers more local
Some header files are never included outside of a mach-davinci
directory and do not need to be made visible in include/mach,
so let's just move them all down one level.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Sekhar Nori <nsekhar@ti.com>
24 files changed, 23 insertions, 23 deletions
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index f8f62fbaa915..3d8cf8cbd98a 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -32,7 +32,7 @@ #include <asm/mach/arch.h> #include <mach/common.h> -#include <mach/cp_intc.h> +#include "cp_intc.h" #include <mach/mux.h> #include <mach/da8xx.h> diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index 1ed545cc2b83..e44899d79cd7 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -40,10 +40,10 @@ #include <linux/spi/flash.h> #include <mach/common.h> -#include <mach/cp_intc.h> +#include "cp_intc.h" #include <mach/da8xx.h> #include <mach/mux.h> -#include <mach/sram.h> +#include "sram.h" #include <asm/mach-types.h> #include <asm/mach/arch.h> diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c index 8cfbfe084535..de1316bf643a 100644 --- a/arch/arm/mach-davinci/board-mityomapl138.c +++ b/arch/arm/mach-davinci/board-mityomapl138.c @@ -26,7 +26,7 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <mach/common.h> -#include <mach/cp_intc.h> +#include "cp_intc.h" #include <mach/da8xx.h> #include <linux/platform_data/mtd-davinci.h> #include <linux/platform_data/mtd-davinci-aemif.h> diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index 2aac51d0e853..ee624861ca66 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -19,7 +19,7 @@ #include <asm/mach/arch.h> #include <mach/common.h> -#include <mach/cp_intc.h> +#include "cp_intc.h" #include <mach/da8xx.h> #include <mach/mux.h> diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c index 3caff9637a82..3424eac6b588 100644 --- a/arch/arm/mach-davinci/clock.c +++ b/arch/arm/mach-davinci/clock.c @@ -23,7 +23,7 @@ #include <mach/hardware.h> #include <mach/clock.h> -#include <mach/psc.h> +#include "psc.h" #include <mach/cputype.h> #include "clock.h" diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index 507aad4b8dd9..1a68d2477de6 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -19,7 +19,7 @@ #include <linux/of_irq.h> #include <mach/common.h> -#include <mach/cp_intc.h> +#include "cp_intc.h" static inline unsigned int cp_intc_read(unsigned offset) { diff --git a/arch/arm/mach-davinci/include/mach/cp_intc.h b/arch/arm/mach-davinci/cp_intc.h index 827bbe9baed4..827bbe9baed4 100644 --- a/arch/arm/mach-davinci/include/mach/cp_intc.h +++ b/arch/arm/mach-davinci/cp_intc.h diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c index 306ebc51599a..1b8f08532455 100644 --- a/arch/arm/mach-davinci/cpuidle.c +++ b/arch/arm/mach-davinci/cpuidle.c @@ -19,8 +19,8 @@ #include <linux/export.h> #include <asm/cpuidle.h> -#include <mach/cpuidle.h> -#include <mach/ddr2.h> +#include "cpuidle.h" +#include "ddr2.h" #define DAVINCI_CPUIDLE_MAX_STATES 2 diff --git a/arch/arm/mach-davinci/include/mach/cpuidle.h b/arch/arm/mach-davinci/cpuidle.h index 74f088b0edfb..74f088b0edfb 100644 --- a/arch/arm/mach-davinci/include/mach/cpuidle.h +++ b/arch/arm/mach-davinci/cpuidle.h diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 115d5736da80..7187e7fc2822 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -15,7 +15,7 @@ #include <asm/mach/map.h> -#include <mach/psc.h> +#include "psc.h" #include <mach/irqs.h> #include <mach/cputype.h> #include <mach/common.h> diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 676997895e13..97d8779a9a65 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -22,7 +22,7 @@ #include <asm/mach/map.h> -#include <mach/psc.h> +#include "psc.h" #include <mach/irqs.h> #include <mach/cputype.h> #include <mach/common.h> diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c index 06b6451225c1..c4b5808ca7c1 100644 --- a/arch/arm/mach-davinci/da8xx-dt.c +++ b/arch/arm/mach-davinci/da8xx-dt.c @@ -15,7 +15,7 @@ #include <asm/mach/arch.h> #include <mach/common.h> -#include <mach/cp_intc.h> +#include "cp_intc.h" #include <mach/da8xx.h> #define DA8XX_NUM_UARTS 3 diff --git a/arch/arm/mach-davinci/include/mach/ddr2.h b/arch/arm/mach-davinci/ddr2.h index c19e047d0e6a..c19e047d0e6a 100644 --- a/arch/arm/mach-davinci/include/mach/ddr2.h +++ b/arch/arm/mach-davinci/ddr2.h diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index 28c90bc372bd..e88b7a5cde99 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -22,8 +22,8 @@ #include <mach/common.h> #include <mach/time.h> #include <mach/da8xx.h> -#include <mach/cpuidle.h> -#include <mach/sram.h> +#include "cpuidle.h" +#include "sram.h" #include "clock.h" #include "asp.h" diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index 609950b8c191..c7c1458df23c 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -21,7 +21,7 @@ #include <asm/mach/map.h> #include <mach/cputype.h> -#include <mach/psc.h> +#include "psc.h" #include <mach/mux.h> #include <mach/irqs.h> #include <mach/time.h> diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 2068cbeaeb03..01843fbcc9ea 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -26,7 +26,7 @@ #include <asm/mach/map.h> #include <mach/cputype.h> -#include <mach/psc.h> +#include "psc.h" #include <mach/mux.h> #include <mach/irqs.h> #include <mach/time.h> diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index d38f5049d56e..b28071ae3a57 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -19,7 +19,7 @@ #include <mach/cputype.h> #include <mach/irqs.h> -#include <mach/psc.h> +#include "psc.h" #include <mach/mux.h> #include <mach/time.h> #include <mach/serial.h> diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 70eb42725eec..cf80786e2471 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -20,7 +20,7 @@ #include <mach/cputype.h> #include <mach/irqs.h> -#include <mach/psc.h> +#include "psc.h" #include <mach/mux.h> #include <mach/time.h> #include <mach/serial.h> diff --git a/arch/arm/mach-davinci/pm.c b/arch/arm/mach-davinci/pm.c index 07e23ba61f3a..8929569b1f8a 100644 --- a/arch/arm/mach-davinci/pm.c +++ b/arch/arm/mach-davinci/pm.c @@ -21,7 +21,7 @@ #include <mach/common.h> #include <mach/da8xx.h> -#include <mach/sram.h> +#include "sram.h" #include <mach/pm.h> #include "clock.h" diff --git a/arch/arm/mach-davinci/psc.c b/arch/arm/mach-davinci/psc.c index 82fdc69d5728..e5dc6bfde5f3 100644 --- a/arch/arm/mach-davinci/psc.c +++ b/arch/arm/mach-davinci/psc.c @@ -23,7 +23,7 @@ #include <linux/io.h> #include <mach/cputype.h> -#include <mach/psc.h> +#include "psc.h" #include "clock.h" diff --git a/arch/arm/mach-davinci/include/mach/psc.h b/arch/arm/mach-davinci/psc.h index 99d47cfa301f..99d47cfa301f 100644 --- a/arch/arm/mach-davinci/include/mach/psc.h +++ b/arch/arm/mach-davinci/psc.h diff --git a/arch/arm/mach-davinci/sleep.S b/arch/arm/mach-davinci/sleep.S index a5336a5e2739..cd350dee4df3 100644 --- a/arch/arm/mach-davinci/sleep.S +++ b/arch/arm/mach-davinci/sleep.S @@ -21,8 +21,8 @@ #include <linux/linkage.h> #include <asm/assembler.h> -#include <mach/psc.h> -#include <mach/ddr2.h> +#include "psc.h" +#include "ddr2.h" #include "clock.h" diff --git a/arch/arm/mach-davinci/sram.c b/arch/arm/mach-davinci/sram.c index 8540dddf1fbd..668b6e749768 100644 --- a/arch/arm/mach-davinci/sram.c +++ b/arch/arm/mach-davinci/sram.c @@ -14,7 +14,7 @@ #include <linux/genalloc.h> #include <mach/common.h> -#include <mach/sram.h> +#include "sram.h" static struct gen_pool *sram_pool; diff --git a/arch/arm/mach-davinci/include/mach/sram.h b/arch/arm/mach-davinci/sram.h index 4e5db56218b8..4e5db56218b8 100644 --- a/arch/arm/mach-davinci/include/mach/sram.h +++ b/arch/arm/mach-davinci/sram.h |