diff options
Diffstat (limited to 'include/asm-arm/arch-omap')
-rw-r--r-- | include/asm-arm/arch-omap/dma.h | 3 | ||||
-rw-r--r-- | include/asm-arm/arch-omap/entry-macro.S | 2 | ||||
-rw-r--r-- | include/asm-arm/arch-omap/system.h | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-arm/arch-omap/dma.h b/include/asm-arm/arch-omap/dma.h index ccbcb580a5c1..d4e73efcb816 100644 --- a/include/asm-arm/arch-omap/dma.h +++ b/include/asm-arm/arch-omap/dma.h | |||
@@ -21,9 +21,6 @@ | |||
21 | #ifndef __ASM_ARCH_DMA_H | 21 | #ifndef __ASM_ARCH_DMA_H |
22 | #define __ASM_ARCH_DMA_H | 22 | #define __ASM_ARCH_DMA_H |
23 | 23 | ||
24 | #define MAX_DMA_ADDRESS 0xffffffff | ||
25 | #define MAX_DMA_CHANNELS 0 | ||
26 | |||
27 | /* Hardware registers for omap1 */ | 24 | /* Hardware registers for omap1 */ |
28 | #define OMAP_DMA_BASE (0xfffed800) | 25 | #define OMAP_DMA_BASE (0xfffed800) |
29 | #define OMAP_DMA_GCR (OMAP_DMA_BASE + 0x400) | 26 | #define OMAP_DMA_GCR (OMAP_DMA_BASE + 0x400) |
diff --git a/include/asm-arm/arch-omap/entry-macro.S b/include/asm-arm/arch-omap/entry-macro.S index f8814a84910e..0ffb1185f1ac 100644 --- a/include/asm-arm/arch-omap/entry-macro.S +++ b/include/asm-arm/arch-omap/entry-macro.S | |||
@@ -7,6 +7,8 @@ | |||
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> | ||
11 | #include <asm/arch/irqs.h> | ||
10 | 12 | ||
11 | #if defined(CONFIG_ARCH_OMAP1) | 13 | #if defined(CONFIG_ARCH_OMAP1) |
12 | 14 | ||
diff --git a/include/asm-arm/arch-omap/system.h b/include/asm-arm/arch-omap/system.h index 9af415d2944a..6724a81bd10b 100644 --- a/include/asm-arm/arch-omap/system.h +++ b/include/asm-arm/arch-omap/system.h | |||
@@ -5,8 +5,9 @@ | |||
5 | #ifndef __ASM_ARCH_SYSTEM_H | 5 | #ifndef __ASM_ARCH_SYSTEM_H |
6 | #define __ASM_ARCH_SYSTEM_H | 6 | #define __ASM_ARCH_SYSTEM_H |
7 | #include <linux/config.h> | 7 | #include <linux/config.h> |
8 | #include <linux/clk.h> | ||
9 | |||
8 | #include <asm/mach-types.h> | 10 | #include <asm/mach-types.h> |
9 | #include <asm/hardware/clock.h> | ||
10 | #include <asm/hardware.h> | 11 | #include <asm/hardware.h> |
11 | #include <asm/arch/prcm.h> | 12 | #include <asm/arch/prcm.h> |
12 | 13 | ||