diff options
Diffstat (limited to 'arch/arm/mach-spear6xx/include')
-rw-r--r-- | arch/arm/mach-spear6xx/include/mach/entry-macro.S | 2 | ||||
-rw-r--r-- | arch/arm/mach-spear6xx/include/mach/generic.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-spear6xx/include/mach/entry-macro.S b/arch/arm/mach-spear6xx/include/mach/entry-macro.S index 9eaecaeafcf0..bc55e8b04d12 100644 --- a/arch/arm/mach-spear6xx/include/mach/entry-macro.S +++ b/arch/arm/mach-spear6xx/include/mach/entry-macro.S | |||
@@ -11,9 +11,9 @@ | |||
11 | * warranty of any kind, whether express or implied. | 11 | * warranty of any kind, whether express or implied. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <asm/hardware/vic.h> | ||
14 | #include <mach/hardware.h> | 15 | #include <mach/hardware.h> |
15 | #include <mach/spear.h> | 16 | #include <mach/spear.h> |
16 | #include <asm/hardware/vic.h> | ||
17 | 17 | ||
18 | .macro disable_fiq | 18 | .macro disable_fiq |
19 | .endm | 19 | .endm |
diff --git a/arch/arm/mach-spear6xx/include/mach/generic.h b/arch/arm/mach-spear6xx/include/mach/generic.h index e5967ededdc3..94cf4a648b57 100644 --- a/arch/arm/mach-spear6xx/include/mach/generic.h +++ b/arch/arm/mach-spear6xx/include/mach/generic.h | |||
@@ -14,11 +14,11 @@ | |||
14 | #ifndef __MACH_GENERIC_H | 14 | #ifndef __MACH_GENERIC_H |
15 | #define __MACH_GENERIC_H | 15 | #define __MACH_GENERIC_H |
16 | 16 | ||
17 | #include <asm/mach/time.h> | ||
18 | #include <asm/mach/map.h> | ||
19 | #include <linux/init.h> | 17 | #include <linux/init.h> |
20 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
21 | #include <linux/amba/bus.h> | 19 | #include <linux/amba/bus.h> |
20 | #include <asm/mach/time.h> | ||
21 | #include <asm/mach/map.h> | ||
22 | 22 | ||
23 | /* | 23 | /* |
24 | * Each GPT has 2 timer channels | 24 | * Each GPT has 2 timer channels |