diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-11-25 17:32:22 +0100 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2015-12-18 14:09:34 +0100 |
commit | 6d407a6eac8378c45a09a3c071d6f1ed31d938e9 (patch) | |
tree | 99dd31c54df49dc37a4997e5036772ad5bff6cdf /arch | |
parent | ARM: no longer make CPU targets visible separately (diff) | |
download | linux-6d407a6eac8378c45a09a3c071d6f1ed31d938e9.tar.xz linux-6d407a6eac8378c45a09a3c071d6f1ed31d938e9.zip |
ARM: realview: make all header files local
Nothing includes these files any more, so we can simply move them
from arch/arm/mach-realview/include/mach/ to arch/arm/mach-realview.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[Two fixes added to make everything compile]
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-realview/board-eb.h (renamed from arch/arm/mach-realview/include/mach/board-eb.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/board-pb1176.h (renamed from arch/arm/mach-realview/include/mach/board-pb1176.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/board-pb11mp.h (renamed from arch/arm/mach-realview/include/mach/board-pb11mp.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/board-pba8.h (renamed from arch/arm/mach-realview/include/mach/board-pba8.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/board-pbx.h (renamed from arch/arm/mach-realview/include/mach/board-pbx.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/core.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-realview/hardware.h (renamed from arch/arm/mach-realview/include/mach/hardware.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-realview/irqs-eb.h (renamed from arch/arm/mach-realview/include/mach/irqs-eb.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-realview/irqs-pb1176.h (renamed from arch/arm/mach-realview/include/mach/irqs-pb1176.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/irqs-pb11mp.h (renamed from arch/arm/mach-realview/include/mach/irqs-pb11mp.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-realview/irqs-pba8.h (renamed from arch/arm/mach-realview/include/mach/irqs-pba8.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-realview/irqs-pbx.h (renamed from arch/arm/mach-realview/include/mach/irqs-pbx.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-realview/irqs.h (renamed from arch/arm/mach-realview/include/mach/irqs.h) | 10 | ||||
-rw-r--r-- | arch/arm/mach-realview/platform.h (renamed from arch/arm/mach-realview/include/mach/platform.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-realview/platsmp.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_eb.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pb1176.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pb11mp.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pba8.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pbx.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-realview/uncompress.h (renamed from arch/arm/mach-realview/include/mach/uncompress.h) | 12 |
21 files changed, 37 insertions, 41 deletions
diff --git a/arch/arm/mach-realview/include/mach/board-eb.h b/arch/arm/mach-realview/board-eb.h index a301e61a5554..ac9c98f9a971 100644 --- a/arch/arm/mach-realview/include/mach/board-eb.h +++ b/arch/arm/mach-realview/board-eb.h @@ -21,7 +21,7 @@ #ifndef __ASM_ARCH_BOARD_EB_H #define __ASM_ARCH_BOARD_EB_H -#include <mach/platform.h> +#include "platform.h" /* * RealView EB + ARM11MPCore peripheral addresses diff --git a/arch/arm/mach-realview/include/mach/board-pb1176.h b/arch/arm/mach-realview/board-pb1176.h index 2a15fef94730..836433dc789c 100644 --- a/arch/arm/mach-realview/include/mach/board-pb1176.h +++ b/arch/arm/mach-realview/board-pb1176.h @@ -21,7 +21,7 @@ #ifndef __ASM_ARCH_BOARD_PB1176_H #define __ASM_ARCH_BOARD_PB1176_H -#include <mach/platform.h> +#include "platform.h" /* * Peripheral addresses diff --git a/arch/arm/mach-realview/include/mach/board-pb11mp.h b/arch/arm/mach-realview/board-pb11mp.h index aa2d4e02ea2c..e3a758b147ab 100644 --- a/arch/arm/mach-realview/include/mach/board-pb11mp.h +++ b/arch/arm/mach-realview/board-pb11mp.h @@ -21,7 +21,7 @@ #ifndef __ASM_ARCH_BOARD_PB11MP_H #define __ASM_ARCH_BOARD_PB11MP_H -#include <mach/platform.h> +#include "platform.h" /* * Peripheral addresses diff --git a/arch/arm/mach-realview/include/mach/board-pba8.h b/arch/arm/mach-realview/board-pba8.h index 4dfc67a4f45f..84232fe942d2 100644 --- a/arch/arm/mach-realview/include/mach/board-pba8.h +++ b/arch/arm/mach-realview/board-pba8.h @@ -21,7 +21,7 @@ #ifndef __ASM_ARCH_BOARD_PBA8_H #define __ASM_ARCH_BOARD_PBA8_H -#include <mach/platform.h> +#include "platform.h" /* * Peripheral addresses diff --git a/arch/arm/mach-realview/include/mach/board-pbx.h b/arch/arm/mach-realview/board-pbx.h index 848bfff6d8f1..3dab54fa9e97 100644 --- a/arch/arm/mach-realview/include/mach/board-pbx.h +++ b/arch/arm/mach-realview/board-pbx.h @@ -20,7 +20,7 @@ #ifndef __ASM_ARCH_BOARD_PBX_H #define __ASM_ARCH_BOARD_PBX_H -#include <mach/platform.h> +#include "platform.h" /* * Peripheral addresses diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c index 44575edc44b1..baf174542e36 100644 --- a/arch/arm/mach-realview/core.c +++ b/arch/arm/mach-realview/core.c @@ -36,8 +36,7 @@ #include <linux/memblock.h> #include <clocksource/timer-sp804.h> - -#include <mach/hardware.h> +#include "hardware.h" #include <asm/irq.h> #include <asm/mach-types.h> #include <asm/hardware/icst.h> @@ -46,8 +45,7 @@ #include <asm/mach/irq.h> #include <asm/mach/map.h> -#include <mach/platform.h> -#include <mach/irqs.h> +#include "platform.h" #include <plat/sched_clock.h> diff --git a/arch/arm/mach-realview/include/mach/hardware.h b/arch/arm/mach-realview/hardware.h index 281e71c97525..281e71c97525 100644 --- a/arch/arm/mach-realview/include/mach/hardware.h +++ b/arch/arm/mach-realview/hardware.h diff --git a/arch/arm/mach-realview/include/mach/irqs-eb.h b/arch/arm/mach-realview/irqs-eb.h index 44754230fdcc..44754230fdcc 100644 --- a/arch/arm/mach-realview/include/mach/irqs-eb.h +++ b/arch/arm/mach-realview/irqs-eb.h diff --git a/arch/arm/mach-realview/include/mach/irqs-pb1176.h b/arch/arm/mach-realview/irqs-pb1176.h index 708f84156f2c..bfd1badce4c9 100644 --- a/arch/arm/mach-realview/include/mach/irqs-pb1176.h +++ b/arch/arm/mach-realview/irqs-pb1176.h @@ -95,6 +95,4 @@ #define MAX_GIC_NR NR_GIC_PB1176 #endif -#endif /* CONFIG_MACH_REALVIEW_PB1176 */ - #endif /* __MACH_IRQS_PB1176_H */ diff --git a/arch/arm/mach-realview/include/mach/irqs-pb11mp.h b/arch/arm/mach-realview/irqs-pb11mp.h index 34e255add21e..34e255add21e 100644 --- a/arch/arm/mach-realview/include/mach/irqs-pb11mp.h +++ b/arch/arm/mach-realview/irqs-pb11mp.h diff --git a/arch/arm/mach-realview/include/mach/irqs-pba8.h b/arch/arm/mach-realview/irqs-pba8.h index 4a88a4edb651..4a88a4edb651 100644 --- a/arch/arm/mach-realview/include/mach/irqs-pba8.h +++ b/arch/arm/mach-realview/irqs-pba8.h diff --git a/arch/arm/mach-realview/include/mach/irqs-pbx.h b/arch/arm/mach-realview/irqs-pbx.h index 206a3001f46b..206a3001f46b 100644 --- a/arch/arm/mach-realview/include/mach/irqs-pbx.h +++ b/arch/arm/mach-realview/irqs-pbx.h diff --git a/arch/arm/mach-realview/include/mach/irqs.h b/arch/arm/mach-realview/irqs.h index 78854f2fa323..1bd8a9a00337 100644 --- a/arch/arm/mach-realview/include/mach/irqs.h +++ b/arch/arm/mach-realview/irqs.h @@ -22,11 +22,11 @@ #ifndef __ASM_ARCH_IRQS_H #define __ASM_ARCH_IRQS_H -#include <mach/irqs-eb.h> -#include <mach/irqs-pb11mp.h> -#include <mach/irqs-pb1176.h> -#include <mach/irqs-pba8.h> -#include <mach/irqs-pbx.h> +#include "irqs-eb.h" +#include "irqs-pb11mp.h" +#include "irqs-pb1176.h" +#include "irqs-pba8.h" +#include "irqs-pbx.h" #define IRQ_LOCALTIMER 29 #define IRQ_LOCALWDOG 30 diff --git a/arch/arm/mach-realview/include/mach/platform.h b/arch/arm/mach-realview/platform.h index 1b77a27badaf..1b77a27badaf 100644 --- a/arch/arm/mach-realview/include/mach/platform.h +++ b/arch/arm/mach-realview/platform.h diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c index 98e3052b7933..a2331b36ccce 100644 --- a/arch/arm/mach-realview/platsmp.c +++ b/arch/arm/mach-realview/platsmp.c @@ -13,13 +13,13 @@ #include <linux/smp.h> #include <linux/io.h> -#include <mach/hardware.h> +#include "hardware.h" #include <asm/mach-types.h> #include <asm/smp_scu.h> -#include <mach/board-eb.h> -#include <mach/board-pb11mp.h> -#include <mach/board-pbx.h> +#include "board-eb.h" +#include "board-pb11mp.h" +#include "board-pbx.h" #include <plat/platsmp.h> diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index 1a2a89708fb7..e23368c354ed 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c @@ -31,7 +31,7 @@ #include <linux/platform_data/clk-realview.h> #include <linux/reboot.h> -#include <mach/hardware.h> +#include "hardware.h" #include <asm/irq.h> #include <asm/mach-types.h> #include <asm/pgtable.h> @@ -44,8 +44,8 @@ #include <asm/mach/map.h> #include <asm/mach/time.h> -#include <mach/board-eb.h> -#include <mach/irqs.h> +#include "board-eb.h" +#include "irqs.h" #include "core.h" diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c index ce92c1823494..e5fd1ce9051f 100644 --- a/arch/arm/mach-realview/realview_pb1176.c +++ b/arch/arm/mach-realview/realview_pb1176.c @@ -34,7 +34,7 @@ #include <linux/reboot.h> #include <linux/memblock.h> -#include <mach/hardware.h> +#include "hardware.h" #include <asm/irq.h> #include <asm/mach-types.h> #include <asm/pgtable.h> @@ -45,8 +45,8 @@ #include <asm/mach/map.h> #include <asm/mach/time.h> -#include <mach/board-pb1176.h> -#include <mach/irqs.h> +#include "board-pb1176.h" +#include "irqs.h" #include "core.h" diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c index 5bb460300b6a..3b82599826b7 100644 --- a/arch/arm/mach-realview/realview_pb11mp.c +++ b/arch/arm/mach-realview/realview_pb11mp.c @@ -31,7 +31,7 @@ #include <linux/platform_data/clk-realview.h> #include <linux/reboot.h> -#include <mach/hardware.h> +#include "hardware.h" #include <asm/irq.h> #include <asm/mach-types.h> #include <asm/pgtable.h> @@ -44,8 +44,8 @@ #include <asm/mach/time.h> #include <asm/outercache.h> -#include <mach/board-pb11mp.h> -#include <mach/irqs.h> +#include "board-pb11mp.h" +#include "irqs.h" #include "core.h" diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c index b3549a637ff0..263e37391445 100644 --- a/arch/arm/mach-realview/realview_pba8.c +++ b/arch/arm/mach-realview/realview_pba8.c @@ -39,9 +39,9 @@ #include <asm/mach/map.h> #include <asm/mach/time.h> -#include <mach/hardware.h> -#include <mach/board-pba8.h> -#include <mach/irqs.h> +#include "hardware.h" +#include "board-pba8.h" +#include "irqs.h" #include "core.h" diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c index f26e1e09f29e..810b15410bf2 100644 --- a/arch/arm/mach-realview/realview_pbx.c +++ b/arch/arm/mach-realview/realview_pbx.c @@ -41,9 +41,9 @@ #include <asm/mach/map.h> #include <asm/mach/time.h> -#include <mach/hardware.h> -#include <mach/board-pbx.h> -#include <mach/irqs.h> +#include "hardware.h" +#include "board-pbx.h" +#include "irqs.h" #include "core.h" diff --git a/arch/arm/mach-realview/include/mach/uncompress.h b/arch/arm/mach-realview/uncompress.h index cfa30d21783b..f8ac3e723628 100644 --- a/arch/arm/mach-realview/include/mach/uncompress.h +++ b/arch/arm/mach-realview/uncompress.h @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <mach/hardware.h> +#include "hardware.h" #include <asm/mach-types.h> -#include <mach/board-eb.h> -#include <mach/board-pb11mp.h> -#include <mach/board-pb1176.h> -#include <mach/board-pba8.h> -#include <mach/board-pbx.h> +#include "board-eb.h" +#include "board-pb11mp.h" +#include "board-pb1176.h" +#include "board-pba8.h" +#include "board-pbx.h" #define AMBA_UART_DR(base) (*(volatile unsigned char *)((base) + 0x00)) #define AMBA_UART_LCRH(base) (*(volatile unsigned char *)((base) + 0x2c)) |