Commit 6d407a6e authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Walleij

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: default avatarArnd Bergmann <arnd@arndb.de>
[Two fixes added to make everything compile]
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 17d44d7d
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __ASM_ARCH_BOARD_EB_H #ifndef __ASM_ARCH_BOARD_EB_H
#define __ASM_ARCH_BOARD_EB_H #define __ASM_ARCH_BOARD_EB_H
#include <mach/platform.h> #include "platform.h"
/* /*
* RealView EB + ARM11MPCore peripheral addresses * RealView EB + ARM11MPCore peripheral addresses
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __ASM_ARCH_BOARD_PB1176_H #ifndef __ASM_ARCH_BOARD_PB1176_H
#define __ASM_ARCH_BOARD_PB1176_H #define __ASM_ARCH_BOARD_PB1176_H
#include <mach/platform.h> #include "platform.h"
/* /*
* Peripheral addresses * Peripheral addresses
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __ASM_ARCH_BOARD_PB11MP_H #ifndef __ASM_ARCH_BOARD_PB11MP_H
#define __ASM_ARCH_BOARD_PB11MP_H #define __ASM_ARCH_BOARD_PB11MP_H
#include <mach/platform.h> #include "platform.h"
/* /*
* Peripheral addresses * Peripheral addresses
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __ASM_ARCH_BOARD_PBA8_H #ifndef __ASM_ARCH_BOARD_PBA8_H
#define __ASM_ARCH_BOARD_PBA8_H #define __ASM_ARCH_BOARD_PBA8_H
#include <mach/platform.h> #include "platform.h"
/* /*
* Peripheral addresses * Peripheral addresses
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef __ASM_ARCH_BOARD_PBX_H #ifndef __ASM_ARCH_BOARD_PBX_H
#define __ASM_ARCH_BOARD_PBX_H #define __ASM_ARCH_BOARD_PBX_H
#include <mach/platform.h> #include "platform.h"
/* /*
* Peripheral addresses * Peripheral addresses
......
...@@ -36,8 +36,7 @@ ...@@ -36,8 +36,7 @@
#include <linux/memblock.h> #include <linux/memblock.h>
#include <clocksource/timer-sp804.h> #include <clocksource/timer-sp804.h>
#include "hardware.h"
#include <mach/hardware.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/hardware/icst.h> #include <asm/hardware/icst.h>
...@@ -46,8 +45,7 @@ ...@@ -46,8 +45,7 @@
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/platform.h> #include "platform.h"
#include <mach/irqs.h>
#include <plat/sched_clock.h> #include <plat/sched_clock.h>
......
...@@ -95,6 +95,4 @@ ...@@ -95,6 +95,4 @@
#define MAX_GIC_NR NR_GIC_PB1176 #define MAX_GIC_NR NR_GIC_PB1176
#endif #endif
#endif /* CONFIG_MACH_REALVIEW_PB1176 */
#endif /* __MACH_IRQS_PB1176_H */ #endif /* __MACH_IRQS_PB1176_H */
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
#ifndef __ASM_ARCH_IRQS_H #ifndef __ASM_ARCH_IRQS_H
#define __ASM_ARCH_IRQS_H #define __ASM_ARCH_IRQS_H
#include <mach/irqs-eb.h> #include "irqs-eb.h"
#include <mach/irqs-pb11mp.h> #include "irqs-pb11mp.h"
#include <mach/irqs-pb1176.h> #include "irqs-pb1176.h"
#include <mach/irqs-pba8.h> #include "irqs-pba8.h"
#include <mach/irqs-pbx.h> #include "irqs-pbx.h"
#define IRQ_LOCALTIMER 29 #define IRQ_LOCALTIMER 29
#define IRQ_LOCALWDOG 30 #define IRQ_LOCALWDOG 30
......
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h> #include "hardware.h"
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/smp_scu.h> #include <asm/smp_scu.h>
#include <mach/board-eb.h> #include "board-eb.h"
#include <mach/board-pb11mp.h> #include "board-pb11mp.h"
#include <mach/board-pbx.h> #include "board-pbx.h"
#include <plat/platsmp.h> #include <plat/platsmp.h>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <linux/platform_data/clk-realview.h> #include <linux/platform_data/clk-realview.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <mach/hardware.h> #include "hardware.h"
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/board-eb.h> #include "board-eb.h"
#include <mach/irqs.h> #include "irqs.h"
#include "core.h" #include "core.h"
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/memblock.h> #include <linux/memblock.h>
#include <mach/hardware.h> #include "hardware.h"
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/board-pb1176.h> #include "board-pb1176.h"
#include <mach/irqs.h> #include "irqs.h"
#include "core.h" #include "core.h"
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <linux/platform_data/clk-realview.h> #include <linux/platform_data/clk-realview.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <mach/hardware.h> #include "hardware.h"
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/outercache.h> #include <asm/outercache.h>
#include <mach/board-pb11mp.h> #include "board-pb11mp.h"
#include <mach/irqs.h> #include "irqs.h"
#include "core.h" #include "core.h"
......
...@@ -39,9 +39,9 @@ ...@@ -39,9 +39,9 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/hardware.h> #include "hardware.h"
#include <mach/board-pba8.h> #include "board-pba8.h"
#include <mach/irqs.h> #include "irqs.h"
#include "core.h" #include "core.h"
......
...@@ -41,9 +41,9 @@ ...@@ -41,9 +41,9 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/hardware.h> #include "hardware.h"
#include <mach/board-pbx.h> #include "board-pbx.h"
#include <mach/irqs.h> #include "irqs.h"
#include "core.h" #include "core.h"
......
...@@ -17,14 +17,14 @@ ...@@ -17,14 +17,14 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 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 <asm/mach-types.h>
#include <mach/board-eb.h> #include "board-eb.h"
#include <mach/board-pb11mp.h> #include "board-pb11mp.h"
#include <mach/board-pb1176.h> #include "board-pb1176.h"
#include <mach/board-pba8.h> #include "board-pba8.h"
#include <mach/board-pbx.h> #include "board-pbx.h"
#define AMBA_UART_DR(base) (*(volatile unsigned char *)((base) + 0x00)) #define AMBA_UART_DR(base) (*(volatile unsigned char *)((base) + 0x00))
#define AMBA_UART_LCRH(base) (*(volatile unsigned char *)((base) + 0x2c)) #define AMBA_UART_LCRH(base) (*(volatile unsigned char *)((base) + 0x2c))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment