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 | 10 | ||||
| -rw-r--r-- | arch/arm/common/time-acorn.c | 2 | ||||
| -rw-r--r-- | arch/arm/common/uengine.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c index 1f0f0adeafb3..283051eaf931 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/arch/hardware.h> | 28 | #include <mach/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 64c328d1627f..ec8a5471bf06 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/arch/hardware.h> | 29 | #include <mach/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 a0d154006889..db8309161408 100644 --- a/arch/arm/common/sharpsl_pm.c +++ b/arch/arm/common/sharpsl_pm.c | |||
| @@ -26,12 +26,12 @@ | |||
| 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/arch/hardware.h> | 29 | #include <mach/hardware.h> |
| 30 | #include <asm/irq.h> | 30 | #include <asm/irq.h> |
| 31 | #include <asm/arch/pm.h> | 31 | #include <mach/pm.h> |
| 32 | #include <asm/arch/pxa-regs.h> | 32 | #include <mach/pxa-regs.h> |
| 33 | #include <asm/arch/pxa2xx-regs.h> | 33 | #include <mach/pxa2xx-regs.h> |
| 34 | #include <asm/arch/sharpsl.h> | 34 | #include <mach/sharpsl.h> |
| 35 | #include <asm/hardware/sharpsl_pm.h> | 35 | #include <asm/hardware/sharpsl_pm.h> |
| 36 | 36 | ||
| 37 | /* | 37 | /* |
diff --git a/arch/arm/common/time-acorn.c b/arch/arm/common/time-acorn.c index af37bfd74f9c..df0983aafe69 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/arch/hardware.h> | 21 | #include <mach/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 3e19985ddecb..7ecd3c0ab011 100644 --- a/arch/arm/common/uengine.c +++ b/arch/arm/common/uengine.c | |||
| @@ -16,7 +16,7 @@ | |||
| 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/arch/hardware.h> | 19 | #include <mach/hardware.h> |
| 20 | #include <asm/hardware/uengine.h> | 20 | #include <asm/hardware/uengine.h> |
| 21 | #include <asm/io.h> | 21 | #include <asm/io.h> |
| 22 | 22 | ||