Automatic merge with /usr/src/ntfs-2.6.git.

1 files changed, 3 insertions, 4 deletions

diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index 96d90b0c5119..b5e167cf1a05 100644
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -16,14 +16,13 @@ obj-y += vdso32/ vdso64/
 
 obj-$(CONFIG_PPC_OF) += of_device.o
 
-pci-obj-$(CONFIG_PPC_ISERIES)   += iSeries_pci.o iSeries_pci_reset.o
+pci-obj-$(CONFIG_PPC_ISERIES)   += iSeries_pci.o iSeries_irq.o \
+                                iSeries_VpdInfo.o
 pci-obj-$(CONFIG_PPC_MULTIPLATFORM)     += pci_dn.o pci_direct_iommu.o
 
 obj-$(CONFIG_PCI)       += pci.o pci_iommu.o iomap.o $(pci-obj-y)
 
-obj-$(CONFIG_PPC_ISERIES) += iSeries_irq.o \
-                             iSeries_VpdInfo.o XmPciLpEvent.o \
-                             HvCall.o HvLpConfig.o LparData.o \
+obj-$(CONFIG_PPC_ISERIES) += HvCall.o HvLpConfig.o LparData.o \
                              iSeries_setup.o ItLpQueue.o hvCall.o \
                              mf.o HvLpEvent.o iSeries_proc.o iSeries_htab.o \
                              iSeries_iommu.o