Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[pandora-kernel.git] / arch / arm / mach-ixp4xx / Makefile

diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile
index 7a15629..640315d 100644 (file)
--- a/arch/arm/mach-ixp4xx/Makefile
+++ b/arch/arm/mach-ixp4xx/Makefile
@@ -2,11 +2,23 @@
 # Makefile for the linux kernel.
 #
 
-obj-y  += common.o common-pci.o 
+obj-pci-y      :=
+obj-pci-n      :=
 
-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
+obj-pci-$(CONFIG_ARCH_IXDP4XX)         += ixdp425-pci.o
+obj-pci-$(CONFIG_MACH_IXDPG425)                += ixdpg425-pci.o
+obj-pci-$(CONFIG_ARCH_ADI_COYOTE)      += coyote-pci.o
+obj-pci-$(CONFIG_MACH_GTWX5715)                += gtwx5715-pci.o
+obj-pci-$(CONFIG_MACH_NSLU2)           += nslu2-pci.o
+obj-pci-$(CONFIG_MACH_NAS100D)         += nas100d-pci.o
 
+obj-y  += common.o
+
+obj-$(CONFIG_ARCH_IXDP4XX)     += ixdp425-setup.o
+obj-$(CONFIG_MACH_IXDPG425)    += coyote-setup.o
+obj-$(CONFIG_ARCH_ADI_COYOTE)  += coyote-setup.o
+obj-$(CONFIG_MACH_GTWX5715)    += gtwx5715-setup.o
+obj-$(CONFIG_MACH_NSLU2)       += nslu2-setup.o nslu2-power.o
+obj-$(CONFIG_MACH_NAS100D)     += nas100d-setup.o nas100d-power.o
+
+obj-$(CONFIG_PCI)              += $(obj-pci-$(CONFIG_PCI)) common-pci.o