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 /include/asm-arm/arch-clps711x | |
| 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 'include/asm-arm/arch-clps711x')
| -rw-r--r-- | include/asm-arm/arch-clps711x/entry-macro.S | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-clps711x/io.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-clps711x/system.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-clps711x/uncompress.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-arm/arch-clps711x/entry-macro.S b/include/asm-arm/arch-clps711x/entry-macro.S index cd8c5a0bc7bc..3554887cbccb 100644 --- a/include/asm-arm/arch-clps711x/entry-macro.S +++ b/include/asm-arm/arch-clps711x/entry-macro.S | |||
| @@ -7,7 +7,7 @@ | |||
| 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> | 10 | #include <asm/arch/hardware.h> |
| 11 | #include <asm/hardware/clps7111.h> | 11 | #include <asm/hardware/clps7111.h> |
| 12 | 12 | ||
| 13 | .macro disable_fiq | 13 | .macro disable_fiq |
diff --git a/include/asm-arm/arch-clps711x/io.h b/include/asm-arm/arch-clps711x/io.h index 53d790202c19..2b84dac8b2fa 100644 --- a/include/asm-arm/arch-clps711x/io.h +++ b/include/asm-arm/arch-clps711x/io.h | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #ifndef __ASM_ARM_ARCH_IO_H | 20 | #ifndef __ASM_ARM_ARCH_IO_H |
| 21 | #define __ASM_ARM_ARCH_IO_H | 21 | #define __ASM_ARM_ARCH_IO_H |
| 22 | 22 | ||
| 23 | #include <asm/hardware.h> | 23 | #include <asm/arch/hardware.h> |
| 24 | 24 | ||
| 25 | #define IO_SPACE_LIMIT 0xffffffff | 25 | #define IO_SPACE_LIMIT 0xffffffff |
| 26 | 26 | ||
diff --git a/include/asm-arm/arch-clps711x/system.h b/include/asm-arm/arch-clps711x/system.h index 11e1491535a8..1f561772bee4 100644 --- a/include/asm-arm/arch-clps711x/system.h +++ b/include/asm-arm/arch-clps711x/system.h | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #ifndef __ASM_ARCH_SYSTEM_H | 20 | #ifndef __ASM_ARCH_SYSTEM_H |
| 21 | #define __ASM_ARCH_SYSTEM_H | 21 | #define __ASM_ARCH_SYSTEM_H |
| 22 | 22 | ||
| 23 | #include <asm/hardware.h> | 23 | #include <asm/arch/hardware.h> |
| 24 | #include <asm/hardware/clps7111.h> | 24 | #include <asm/hardware/clps7111.h> |
| 25 | #include <asm/io.h> | 25 | #include <asm/io.h> |
| 26 | 26 | ||
diff --git a/include/asm-arm/arch-clps711x/uncompress.h b/include/asm-arm/arch-clps711x/uncompress.h index 03d233ae87ce..8c5684ad086e 100644 --- a/include/asm-arm/arch-clps711x/uncompress.h +++ b/include/asm-arm/arch-clps711x/uncompress.h | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | */ | 19 | */ |
| 20 | #include <asm/arch/io.h> | 20 | #include <asm/arch/io.h> |
| 21 | #include <asm/hardware.h> | 21 | #include <asm/arch/hardware.h> |
| 22 | #include <asm/hardware/clps7111.h> | 22 | #include <asm/hardware/clps7111.h> |
| 23 | 23 | ||
| 24 | #undef CLPS7111_BASE | 24 | #undef CLPS7111_BASE |