diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-12-02 15:49:04 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-12 17:39:53 +0100 |
commit | 2b9c613c4ee1756664fcbf6fc4926fee3e7139c3 (patch) | |
tree | 32df959f729b51b7a56acbe70898f94dc3ae598d | |
parent | a7ed099ffc8edf2a6dccd8a22469347f5cdcfa57 (diff) | |
download | linux-stable-2b9c613c4ee1756664fcbf6fc4926fee3e7139c3.tar.gz linux-stable-2b9c613c4ee1756664fcbf6fc4926fee3e7139c3.tar.bz2 linux-stable-2b9c613c4ee1756664fcbf6fc4926fee3e7139c3.zip |
ARM: spear: move generic.h and pl080.h into private dir
No file outside of mach-spear includes these files any more,
so they don't have to be globally visible now.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
-rw-r--r-- | arch/arm/mach-spear/generic.h (renamed from arch/arm/mach-spear/include/mach/generic.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/include/mach/hardware.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-spear/pl080.h (renamed from arch/arm/mach-spear/include/plat/pl080.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear/platsmp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-spear/restart.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear1310.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear1340.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear13xx.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear300.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear310.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear320.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear3xx.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-spear/spear6xx.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-spear/time.c | 2 |
14 files changed, 13 insertions, 14 deletions
diff --git a/arch/arm/mach-spear/include/mach/generic.h b/arch/arm/mach-spear/generic.h index af47d9b0d83d..af47d9b0d83d 100644 --- a/arch/arm/mach-spear/include/mach/generic.h +++ b/arch/arm/mach-spear/generic.h diff --git a/arch/arm/mach-spear/include/mach/hardware.h b/arch/arm/mach-spear/include/mach/hardware.h deleted file mode 100644 index 40a8c178f10d..000000000000 --- a/arch/arm/mach-spear/include/mach/hardware.h +++ /dev/null @@ -1 +0,0 @@ -/* empty */ diff --git a/arch/arm/mach-spear/include/plat/pl080.h b/arch/arm/mach-spear/pl080.h index eb6590ded40d..eb6590ded40d 100644 --- a/arch/arm/mach-spear/include/plat/pl080.h +++ b/arch/arm/mach-spear/pl080.h diff --git a/arch/arm/mach-spear/platsmp.c b/arch/arm/mach-spear/platsmp.c index af4ade61cd95..927979e26b4d 100644 --- a/arch/arm/mach-spear/platsmp.c +++ b/arch/arm/mach-spear/platsmp.c @@ -19,7 +19,7 @@ #include <asm/cacheflush.h> #include <asm/smp_scu.h> #include <mach/spear.h> -#include <mach/generic.h> +#include "generic.h" static DEFINE_SPINLOCK(boot_lock); diff --git a/arch/arm/mach-spear/restart.c b/arch/arm/mach-spear/restart.c index 7d4616d5df11..004f0f2ff1c6 100644 --- a/arch/arm/mach-spear/restart.c +++ b/arch/arm/mach-spear/restart.c @@ -14,7 +14,7 @@ #include <linux/amba/sp810.h> #include <asm/system_misc.h> #include <mach/spear.h> -#include <mach/generic.h> +#include "generic.h" #define SPEAR13XX_SYS_SW_RES (VA_MISC_BASE + 0x204) void spear_restart(char mode, const char *cmd) diff --git a/arch/arm/mach-spear/spear1310.c b/arch/arm/mach-spear/spear1310.c index 56214d1076ef..fe868b20b46e 100644 --- a/arch/arm/mach-spear/spear1310.c +++ b/arch/arm/mach-spear/spear1310.c @@ -19,7 +19,7 @@ #include <linux/pata_arasan_cf_data.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/generic.h> +#include "generic.h" #include <mach/spear.h> /* Base addresses */ diff --git a/arch/arm/mach-spear/spear1340.c b/arch/arm/mach-spear/spear1340.c index b01c4c7009a7..75e38644bbfb 100644 --- a/arch/arm/mach-spear/spear1340.c +++ b/arch/arm/mach-spear/spear1340.c @@ -20,7 +20,7 @@ #include <linux/of_platform.h> #include <linux/irqchip.h> #include <asm/mach/arch.h> -#include <mach/generic.h> +#include "generic.h" #include <mach/spear.h> #include "spear13xx-dma.h" diff --git a/arch/arm/mach-spear/spear13xx.c b/arch/arm/mach-spear/spear13xx.c index 988fefebf81e..6f62dd59daf6 100644 --- a/arch/arm/mach-spear/spear13xx.c +++ b/arch/arm/mach-spear/spear13xx.c @@ -21,7 +21,7 @@ #include <asm/hardware/cache-l2x0.h> #include <asm/mach/map.h> #include <asm/smp_twd.h> -#include <mach/generic.h> +#include "generic.h" #include <mach/spear.h> #include "spear13xx-dma.h" diff --git a/arch/arm/mach-spear/spear300.c b/arch/arm/mach-spear/spear300.c index 72449eeaa6ae..bac56e845f7a 100644 --- a/arch/arm/mach-spear/spear300.c +++ b/arch/arm/mach-spear/spear300.c @@ -17,7 +17,7 @@ #include <linux/irqchip.h> #include <linux/of_platform.h> #include <asm/mach/arch.h> -#include <mach/generic.h> +#include "generic.h" #include <mach/spear.h> /* DMAC platform data's slave info */ diff --git a/arch/arm/mach-spear/spear310.c b/arch/arm/mach-spear/spear310.c index 0b7962d27694..6ffbc63d516d 100644 --- a/arch/arm/mach-spear/spear310.c +++ b/arch/arm/mach-spear/spear310.c @@ -18,7 +18,7 @@ #include <linux/irqchip.h> #include <linux/of_platform.h> #include <asm/mach/arch.h> -#include <mach/generic.h> +#include "generic.h" #include <mach/spear.h> #define SPEAR310_UART1_BASE UL(0xB2000000) diff --git a/arch/arm/mach-spear/spear320.c b/arch/arm/mach-spear/spear320.c index e9db7dbf6c57..b8a4bb5fcee5 100644 --- a/arch/arm/mach-spear/spear320.c +++ b/arch/arm/mach-spear/spear320.c @@ -20,7 +20,7 @@ #include <linux/of_platform.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/generic.h> +#include "generic.h" #include <mach/spear.h> #define SPEAR320_UART1_BASE UL(0xA3000000) diff --git a/arch/arm/mach-spear/spear3xx.c b/arch/arm/mach-spear/spear3xx.c index d7580f2e5e07..be0c94d04d50 100644 --- a/arch/arm/mach-spear/spear3xx.c +++ b/arch/arm/mach-spear/spear3xx.c @@ -18,8 +18,8 @@ #include <linux/clk.h> #include <linux/io.h> #include <asm/mach/map.h> -#include <plat/pl080.h> -#include <mach/generic.h> +#include "pl080.h" +#include "generic.h" #include <mach/spear.h> /* ssp device registration */ diff --git a/arch/arm/mach-spear/spear6xx.c b/arch/arm/mach-spear/spear6xx.c index 97fb31d8c9b5..78e135977146 100644 --- a/arch/arm/mach-spear/spear6xx.c +++ b/arch/arm/mach-spear/spear6xx.c @@ -24,8 +24,8 @@ #include <asm/mach/arch.h> #include <asm/mach/time.h> #include <asm/mach/map.h> -#include <plat/pl080.h> -#include <mach/generic.h> +#include "pl080.h" +#include "generic.h" #include <mach/spear.h> /* dmac device registration */ diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c index bd5c53cd6962..d449673e40f7 100644 --- a/arch/arm/mach-spear/time.c +++ b/arch/arm/mach-spear/time.c @@ -23,7 +23,7 @@ #include <linux/time.h> #include <linux/irq.h> #include <asm/mach/time.h> -#include <mach/generic.h> +#include "generic.h" /* * We would use TIMER0 and TIMER1 as clockevent and clocksource. |