diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:50:22 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:50:22 -0500 |
commit | f85272a97825d4a67098a8ad70fa5efb55e4847a (patch) | |
tree | e55b38e21b45213269057417032db4440e8f5eed /include/asm-arm/arch-ixp4xx/hardware.h | |
parent | 1c72d8d90da3b29540c3c281a3e0b743ee6b6f74 (diff) | |
parent | 5e04e7fe774794b837e1d3897e6b96ae2d06679a (diff) |
Merge branch 'master'
Diffstat (limited to 'include/asm-arm/arch-ixp4xx/hardware.h')
-rw-r--r-- | include/asm-arm/arch-ixp4xx/hardware.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/arch-ixp4xx/hardware.h b/include/asm-arm/arch-ixp4xx/hardware.h index 55d85eea8c1..cfb413c845f 100644 --- a/include/asm-arm/arch-ixp4xx/hardware.h +++ b/include/asm-arm/arch-ixp4xx/hardware.h @@ -44,5 +44,6 @@ extern unsigned int processor_id; #include "ixdp425.h" #include "coyote.h" #include "prpmc1100.h" +#include "nslu2.h" #endif /* _ASM_ARCH_HARDWARE_H */ |