aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-omap
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-arm/arch-omap')
-rw-r--r--include/asm-arm/arch-omap/entry-macro.S2
-rw-r--r--include/asm-arm/arch-omap/io.h2
-rw-r--r--include/asm-arm/arch-omap/irqs.h2
-rw-r--r--include/asm-arm/arch-omap/mcbsp.h2
-rw-r--r--include/asm-arm/arch-omap/mtd-xip.h2
-rw-r--r--include/asm-arm/arch-omap/system.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-arm/arch-omap/entry-macro.S b/include/asm-arm/arch-omap/entry-macro.S
index 369093a45fcf..67ed7839e782 100644
--- a/include/asm-arm/arch-omap/entry-macro.S
+++ b/include/asm-arm/arch-omap/entry-macro.S
@@ -7,7 +7,7 @@
7 * License version 2. This program is licensed "as is" without any 7 * License version 2. This program is licensed "as is" without any
8 * warranty of any kind, whether express or implied. 8 * warranty of any kind, whether express or implied.
9 */ 9 */
10#include <asm/hardware.h> 10#include <asm/arch/hardware.h>
11#include <asm/arch/io.h> 11#include <asm/arch/io.h>
12#include <asm/arch/irqs.h> 12#include <asm/arch/irqs.h>
13 13
diff --git a/include/asm-arm/arch-omap/io.h b/include/asm-arm/arch-omap/io.h
index 0b13557fd30b..449e3568baa6 100644
--- a/include/asm-arm/arch-omap/io.h
+++ b/include/asm-arm/arch-omap/io.h
@@ -34,7 +34,7 @@
34#ifndef __ASM_ARM_ARCH_IO_H 34#ifndef __ASM_ARM_ARCH_IO_H
35#define __ASM_ARM_ARCH_IO_H 35#define __ASM_ARM_ARCH_IO_H
36 36
37#include <asm/hardware.h> 37#include <asm/arch/hardware.h>
38 38
39#define IO_SPACE_LIMIT 0xffffffff 39#define IO_SPACE_LIMIT 0xffffffff
40 40
diff --git a/include/asm-arm/arch-omap/irqs.h b/include/asm-arm/arch-omap/irqs.h
index 7464c694859b..afbf1e846468 100644
--- a/include/asm-arm/arch-omap/irqs.h
+++ b/include/asm-arm/arch-omap/irqs.h
@@ -327,6 +327,6 @@
327extern void omap_init_irq(void); 327extern void omap_init_irq(void);
328#endif 328#endif
329 329
330#include <asm/hardware.h> 330#include <asm/arch/hardware.h>
331 331
332#endif 332#endif
diff --git a/include/asm-arm/arch-omap/mcbsp.h b/include/asm-arm/arch-omap/mcbsp.h
index 26c78f67dc8e..3da459a282b9 100644
--- a/include/asm-arm/arch-omap/mcbsp.h
+++ b/include/asm-arm/arch-omap/mcbsp.h
@@ -27,7 +27,7 @@
27#include <linux/completion.h> 27#include <linux/completion.h>
28#include <linux/spinlock.h> 28#include <linux/spinlock.h>
29 29
30#include <asm/hardware.h> 30#include <asm/arch/hardware.h>
31#include <asm/arch/clock.h> 31#include <asm/arch/clock.h>
32 32
33#define OMAP730_MCBSP1_BASE 0xfffb1000 33#define OMAP730_MCBSP1_BASE 0xfffb1000
diff --git a/include/asm-arm/arch-omap/mtd-xip.h b/include/asm-arm/arch-omap/mtd-xip.h
index a73a28571fee..f4714b5270d0 100644
--- a/include/asm-arm/arch-omap/mtd-xip.h
+++ b/include/asm-arm/arch-omap/mtd-xip.h
@@ -14,7 +14,7 @@
14#ifndef __ARCH_OMAP_MTD_XIP_H__ 14#ifndef __ARCH_OMAP_MTD_XIP_H__
15#define __ARCH_OMAP_MTD_XIP_H__ 15#define __ARCH_OMAP_MTD_XIP_H__
16 16
17#include <asm/hardware.h> 17#include <asm/arch/hardware.h>
18#define OMAP_MPU_TIMER_BASE (0xfffec500) 18#define OMAP_MPU_TIMER_BASE (0xfffec500)
19#define OMAP_MPU_TIMER_OFFSET 0x100 19#define OMAP_MPU_TIMER_OFFSET 0x100
20 20
diff --git a/include/asm-arm/arch-omap/system.h b/include/asm-arm/arch-omap/system.h
index ac2bfa433f06..176d9d6c258e 100644
--- a/include/asm-arm/arch-omap/system.h
+++ b/include/asm-arm/arch-omap/system.h
@@ -7,7 +7,7 @@
7#include <linux/clk.h> 7#include <linux/clk.h>
8 8
9#include <asm/mach-types.h> 9#include <asm/mach-types.h>
10#include <asm/hardware.h> 10#include <asm/arch/hardware.h>
11 11
12#ifndef CONFIG_MACH_VOICEBLUE 12#ifndef CONFIG_MACH_VOICEBLUE
13#define voiceblue_reset() do {} while (0) 13#define voiceblue_reset() do {} while (0)