diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-04 05:41:28 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:40:08 -0400 |
| commit | be509729356b7433f73df2b9a966674a437fbbc1 (patch) | |
| tree | 5a3e90513c106f9dcf08405e4ebd3599fd14413c /arch/arm/mm | |
| parent | 0f8469a54f7bd65f2c740a5480c56260dc8a7ae0 (diff) | |
[ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead
Remove includes of asm/hardware.h in addition to asm/arch/hardware.h.
Then, since asm/hardware.h only exists to include asm/arch/hardware.h,
update everything to directly include asm/arch/hardware.h and remove
asm/hardware.h.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/cache-v3.S | 2 | ||||
| -rw-r--r-- | arch/arm/mm/cache-v4.S | 2 | ||||
| -rw-r--r-- | arch/arm/mm/cache-v4wt.S | 2 | ||||
| -rw-r--r-- | arch/arm/mm/proc-sa110.S | 2 | ||||
| -rw-r--r-- | arch/arm/mm/proc-sa1100.S | 2 | ||||
| -rw-r--r-- | arch/arm/mm/proc-xsc3.S | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mm/cache-v3.S b/arch/arm/mm/cache-v3.S index e1994788cf0e..3e8d8c798562 100644 --- a/arch/arm/mm/cache-v3.S +++ b/arch/arm/mm/cache-v3.S | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | */ | 9 | */ |
| 10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <asm/hardware.h> | 12 | #include <asm/arch/hardware.h> |
| 13 | #include <asm/page.h> | 13 | #include <asm/page.h> |
| 14 | #include "proc-macros.S" | 14 | #include "proc-macros.S" |
| 15 | 15 | ||
diff --git a/arch/arm/mm/cache-v4.S b/arch/arm/mm/cache-v4.S index b2908063ed6a..8e23c8d69e7a 100644 --- a/arch/arm/mm/cache-v4.S +++ b/arch/arm/mm/cache-v4.S | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | */ | 9 | */ |
| 10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <asm/hardware.h> | 12 | #include <asm/arch/hardware.h> |
| 13 | #include <asm/page.h> | 13 | #include <asm/page.h> |
| 14 | #include "proc-macros.S" | 14 | #include "proc-macros.S" |
| 15 | 15 | ||
diff --git a/arch/arm/mm/cache-v4wt.S b/arch/arm/mm/cache-v4wt.S index 9bcabd86c6f3..d67829f00ee7 100644 --- a/arch/arm/mm/cache-v4wt.S +++ b/arch/arm/mm/cache-v4wt.S | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | */ | 13 | */ |
| 14 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <asm/hardware.h> | 16 | #include <asm/arch/hardware.h> |
| 17 | #include <asm/page.h> | 17 | #include <asm/page.h> |
| 18 | #include "proc-macros.S" | 18 | #include "proc-macros.S" |
| 19 | 19 | ||
diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S index 9818195dbf11..d05e2358b824 100644 --- a/arch/arm/mm/proc-sa110.S +++ b/arch/arm/mm/proc-sa110.S | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include <asm/assembler.h> | 18 | #include <asm/assembler.h> |
| 19 | #include <asm/asm-offsets.h> | 19 | #include <asm/asm-offsets.h> |
| 20 | #include <asm/elf.h> | 20 | #include <asm/elf.h> |
| 21 | #include <asm/hardware.h> | 21 | #include <asm/arch/hardware.h> |
| 22 | #include <asm/pgtable-hwdef.h> | 22 | #include <asm/pgtable-hwdef.h> |
| 23 | #include <asm/pgtable.h> | 23 | #include <asm/pgtable.h> |
| 24 | #include <asm/ptrace.h> | 24 | #include <asm/ptrace.h> |
diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S index c5fe27ad2892..56bd3bfa2942 100644 --- a/arch/arm/mm/proc-sa1100.S +++ b/arch/arm/mm/proc-sa1100.S | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <asm/assembler.h> | 23 | #include <asm/assembler.h> |
| 24 | #include <asm/asm-offsets.h> | 24 | #include <asm/asm-offsets.h> |
| 25 | #include <asm/elf.h> | 25 | #include <asm/elf.h> |
| 26 | #include <asm/hardware.h> | 26 | #include <asm/arch/hardware.h> |
| 27 | #include <asm/pgtable-hwdef.h> | 27 | #include <asm/pgtable-hwdef.h> |
| 28 | #include <asm/pgtable.h> | 28 | #include <asm/pgtable.h> |
| 29 | 29 | ||
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S index 6ff53c24510f..6a0adecfe0ed 100644 --- a/arch/arm/mm/proc-xsc3.S +++ b/arch/arm/mm/proc-xsc3.S | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 29 | #include <asm/assembler.h> | 29 | #include <asm/assembler.h> |
| 30 | #include <asm/elf.h> | 30 | #include <asm/elf.h> |
| 31 | #include <asm/hardware.h> | 31 | #include <asm/arch/hardware.h> |
| 32 | #include <asm/pgtable.h> | 32 | #include <asm/pgtable.h> |
| 33 | #include <asm/pgtable-hwdef.h> | 33 | #include <asm/pgtable-hwdef.h> |
| 34 | #include <asm/page.h> | 34 | #include <asm/page.h> |