Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / arch / powerpc / sysdev / Makefile

diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 14b9abde2d27eaf85fd55b092728bfc7ab7bb467..4c2b356774eada42c083c1796c0f7eec93927088 100644 (file)
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -6,4 +6,5 @@ obj-$(CONFIG_BOOKE)             += dcr.o
 obj-$(CONFIG_40x)              += dcr.o
 obj-$(CONFIG_U3_DART)          += dart_iommu.o
 obj-$(CONFIG_MMIO_NVRAM)       += mmio_nvram.o
-obj-$(CONFIG_83xx)             += ipic.o
+obj-$(CONFIG_PPC_83xx)         += ipic.o
+obj-$(CONFIG_FSL_SOC)          += fsl_soc.o