diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 13:17:11 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 13:17:11 -0500 |
| commit | a46699c9a32505cb5bbfd16f76e7d4a2c84a7705 (patch) | |
| tree | 5c0bc91dd1c07ab95769f5749b3b58235c758d50 /include/asm-arm/arch-ixp4xx/hardware.h | |
| parent | 7ed0175a462c4c30f6df6fac1cccac058f997739 (diff) | |
| parent | b216c01829d0b73a468204e2e763c0a818b77a46 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
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 */ |