diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 10:17:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 10:17:11 -0800 |
| commit | a46699c9a32505cb5bbfd16f76e7d4a2c84a7705 (patch) | |
| tree | 5c0bc91dd1c07ab95769f5749b3b58235c758d50 /arch/arm/mach-ixp4xx/Makefile | |
| parent | 7ed0175a462c4c30f6df6fac1cccac058f997739 (diff) | |
| parent | b216c01829d0b73a468204e2e763c0a818b77a46 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-ixp4xx/Makefile')
| -rw-r--r-- | arch/arm/mach-ixp4xx/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile index ddecbda4a63..7a15629c18d 100644 --- a/arch/arm/mach-ixp4xx/Makefile +++ b/arch/arm/mach-ixp4xx/Makefile @@ -8,4 +8,5 @@ obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pci.o ixdp425-setup.o obj-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o coyote-setup.o obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o coyote-setup.o obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o gtwx5715-setup.o +obj-$(CONFIG_MACH_NSLU2) += nslu2-pci.o nslu2-setup.o nslu2-power.o |