diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 10:45:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 10:45:22 -0800 |
| commit | 8995b161eb142b843094dd614b80e4cce1d66352 (patch) | |
| tree | ffd9988879441d5ec45ab96b2e06f4fcb1210158 /arch/arm/mach-ixp4xx/Makefile | |
| parent | cc918c7ab7da017bfaf9661420bb5c462e057cfb (diff) | |
| parent | fe5dd7c73d328b255286b6b65ca19dd34447f709 (diff) | |
| download | blackbird-op-linux-8995b161eb142b843094dd614b80e4cce1d66352.tar.gz blackbird-op-linux-8995b161eb142b843094dd614b80e4cce1d66352.zip | |
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 7a15629c18d0..0471044fa179 100644 --- a/arch/arm/mach-ixp4xx/Makefile +++ b/arch/arm/mach-ixp4xx/Makefile @@ -9,4 +9,5 @@ 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 +obj-$(CONFIG_MACH_NAS100D) += nas100d-pci.o nas100d-setup.o nas100d-power.o |
