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-iop13xx | |
| 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-iop13xx')
| -rw-r--r-- | include/asm-arm/arch-iop13xx/adma.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-iop13xx/timex.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-iop13xx/uncompress.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/arch-iop13xx/adma.h b/include/asm-arm/arch-iop13xx/adma.h index ef4f5da2029f..26f60af67168 100644 --- a/include/asm-arm/arch-iop13xx/adma.h +++ b/include/asm-arm/arch-iop13xx/adma.h | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #define _ADMA_H | 19 | #define _ADMA_H |
| 20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
| 22 | #include <asm/hardware.h> | 22 | #include <asm/arch/hardware.h> |
| 23 | #include <asm/hardware/iop_adma.h> | 23 | #include <asm/hardware/iop_adma.h> |
| 24 | 24 | ||
| 25 | #define ADMA_ACCR(chan) (chan->mmr_base + 0x0) | 25 | #define ADMA_ACCR(chan) (chan->mmr_base + 0x0) |
diff --git a/include/asm-arm/arch-iop13xx/timex.h b/include/asm-arm/arch-iop13xx/timex.h index f0c51dd97ed8..47564ecb3872 100644 --- a/include/asm-arm/arch-iop13xx/timex.h +++ b/include/asm-arm/arch-iop13xx/timex.h | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | #include <asm/hardware.h> | 1 | #include <asm/arch/hardware.h> |
| 2 | 2 | ||
| 3 | #define CLOCK_TICK_RATE (100 * HZ) | 3 | #define CLOCK_TICK_RATE (100 * HZ) |
diff --git a/include/asm-arm/arch-iop13xx/uncompress.h b/include/asm-arm/arch-iop13xx/uncompress.h index dd9c2934190e..5d4418decb86 100644 --- a/include/asm-arm/arch-iop13xx/uncompress.h +++ b/include/asm-arm/arch-iop13xx/uncompress.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #include <asm/types.h> | 1 | #include <asm/types.h> |
| 2 | #include <linux/serial_reg.h> | 2 | #include <linux/serial_reg.h> |
| 3 | #include <asm/hardware.h> | 3 | #include <asm/arch/hardware.h> |
| 4 | 4 | ||
| 5 | #define UART_BASE ((volatile u32 *)IOP13XX_UART1_PHYS) | 5 | #define UART_BASE ((volatile u32 *)IOP13XX_UART1_PHYS) |
| 6 | #define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE) | 6 | #define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE) |