diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-10 18:34:57 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-10 18:34:57 -0500 |
| commit | 9551583e55e26a0940894828c2d1066e9276325e (patch) | |
| tree | ff412949400da94aa788bd094ced2138e9175935 /include/asm-arm/arch-ixp4xx/hardware.h | |
| parent | a2653ebab3a96c6e6183360821faa492c1f88c3f (diff) | |
| parent | 985834a1c3a2e9639145bd8ea16af6e25f2143ad (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 55d85eea8c1a..cfb413c845f7 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; | |||
| 44 | #include "ixdp425.h" | 44 | #include "ixdp425.h" |
| 45 | #include "coyote.h" | 45 | #include "coyote.h" |
| 46 | #include "prpmc1100.h" | 46 | #include "prpmc1100.h" |
| 47 | #include "nslu2.h" | ||
| 47 | 48 | ||
| 48 | #endif /* _ASM_ARCH_HARDWARE_H */ | 49 | #endif /* _ASM_ARCH_HARDWARE_H */ |