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-ixp4xx/nas100d.h | |
| 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-ixp4xx/nas100d.h')
| -rw-r--r-- | include/asm-arm/arch-ixp4xx/nas100d.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-ixp4xx/nas100d.h b/include/asm-arm/arch-ixp4xx/nas100d.h index 98d937897bce..ecb12d66399c 100644 --- a/include/asm-arm/arch-ixp4xx/nas100d.h +++ b/include/asm-arm/arch-ixp4xx/nas100d.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #ifndef __ASM_ARCH_HARDWARE_H__ | 18 | #ifndef __ASM_ARCH_HARDWARE_H__ |
| 19 | #error "Do not include this directly, instead #include <asm/hardware.h>" | 19 | #error "Do not include this directly, instead #include <asm/arch/hardware.h>" |
| 20 | #endif | 20 | #endif |
| 21 | 21 | ||
| 22 | #define NAS100D_SDA_PIN 5 | 22 | #define NAS100D_SDA_PIN 5 |