1 files changed, 5 insertions, 2 deletions

diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index 2ecccb6b4f8c..f4b3bfcc109d 100644
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -11,7 +11,7 @@ obj-y               :=	setup.o entry.o traps.o irq.o idle.o dma.o \
                         udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \
                         ptrace32.o signal32.o rtc.o init_task.o \
                         lmb.o cputable.o cpu_setup_power4.o idle_power4.o \
-                        iommu.o sysfs.o vdso.o pmc.o
+                        iommu.o sysfs.o vdso.o pmc.o firmware.o
 obj-y += vdso32/ vdso64/
 
 obj-$(CONFIG_PPC_OF) += of_device.o
@@ -50,7 +50,10 @@ obj-$(CONFIG_LPARCFG)		+= lparcfg.o
 obj-$(CONFIG_HVC_CONSOLE)       += hvconsole.o
 obj-$(CONFIG_BOOTX_TEXT)        += btext.o
 obj-$(CONFIG_HVCS)              += hvcserver.o
-obj-$(CONFIG_IBMVIO)            += vio.o
+
+vio-obj-$(CONFIG_PPC_PSERIES)   += pSeries_vio.o
+vio-obj-$(CONFIG_PPC_ISERIES)   += iSeries_vio.o
+obj-$(CONFIG_IBMVIO)            += vio.o $(vio-obj-y)
 obj-$(CONFIG_XICS)              += xics.o
 obj-$(CONFIG_MPIC)              += mpic.o