diff options
Diffstat (limited to 'arch/arm/common')
-rw-r--r-- | arch/arm/common/locomo.c | 2 | ||||
-rw-r--r-- | arch/arm/common/sa1111.c | 2 | ||||
-rw-r--r-- | arch/arm/common/sharpsl_pm.c | 2 | ||||
-rw-r--r-- | arch/arm/common/time-acorn.c | 2 | ||||
-rw-r--r-- | arch/arm/common/uengine.c | 1 |
5 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c index 85579654d3b7..1f0f0adeafb3 100644 --- a/arch/arm/common/locomo.c +++ b/arch/arm/common/locomo.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
26 | #include <linux/spinlock.h> | 26 | #include <linux/spinlock.h> |
27 | 27 | ||
28 | #include <asm/hardware.h> | 28 | #include <asm/arch/hardware.h> |
29 | #include <asm/io.h> | 29 | #include <asm/io.h> |
30 | #include <asm/irq.h> | 30 | #include <asm/irq.h> |
31 | #include <asm/mach/irq.h> | 31 | #include <asm/mach/irq.h> |
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index f6d3fdda7067..64c328d1627f 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <linux/dma-mapping.h> | 26 | #include <linux/dma-mapping.h> |
27 | #include <linux/clk.h> | 27 | #include <linux/clk.h> |
28 | 28 | ||
29 | #include <asm/hardware.h> | 29 | #include <asm/arch/hardware.h> |
30 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |
31 | #include <asm/io.h> | 31 | #include <asm/io.h> |
32 | #include <asm/irq.h> | 32 | #include <asm/irq.h> |
diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c index 7a1f9e3581fd..a0d154006889 100644 --- a/arch/arm/common/sharpsl_pm.c +++ b/arch/arm/common/sharpsl_pm.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <linux/apm-emulation.h> | 26 | #include <linux/apm-emulation.h> |
27 | #include <linux/suspend.h> | 27 | #include <linux/suspend.h> |
28 | 28 | ||
29 | #include <asm/hardware.h> | 29 | #include <asm/arch/hardware.h> |
30 | #include <asm/irq.h> | 30 | #include <asm/irq.h> |
31 | #include <asm/arch/pm.h> | 31 | #include <asm/arch/pm.h> |
32 | #include <asm/arch/pxa-regs.h> | 32 | #include <asm/arch/pxa-regs.h> |
diff --git a/arch/arm/common/time-acorn.c b/arch/arm/common/time-acorn.c index d544da414731..af37bfd74f9c 100644 --- a/arch/arm/common/time-acorn.c +++ b/arch/arm/common/time-acorn.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
19 | #include <linux/irq.h> | 19 | #include <linux/irq.h> |
20 | 20 | ||
21 | #include <asm/hardware.h> | 21 | #include <asm/arch/hardware.h> |
22 | #include <asm/io.h> | 22 | #include <asm/io.h> |
23 | #include <asm/hardware/ioc.h> | 23 | #include <asm/hardware/ioc.h> |
24 | 24 | ||
diff --git a/arch/arm/common/uengine.c b/arch/arm/common/uengine.c index 117cab30bd36..3e19985ddecb 100644 --- a/arch/arm/common/uengine.c +++ b/arch/arm/common/uengine.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
18 | #include <linux/string.h> | 18 | #include <linux/string.h> |
19 | #include <asm/hardware.h> | ||
20 | #include <asm/arch/hardware.h> | 19 | #include <asm/arch/hardware.h> |
21 | #include <asm/hardware/uengine.h> | 20 | #include <asm/hardware/uengine.h> |
22 | #include <asm/io.h> | 21 | #include <asm/io.h> |