powerpc: Move iSeries_irq.c to powerpc/platorms/iseries

And rename it to irq.c.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

3 files changed, 2 insertions, 4 deletions

diff --git a/arch/powerpc/platforms/iseries/Makefile b/arch/powerpc/platforms/iseries/Makefile
index 7ee4592f83d3..e5d6ab9e30bb 100644
--- a/arch/powerpc/platforms/iseries/Makefile
+++ b/arch/powerpc/platforms/iseries/Makefile
@@ -1,3 +1,3 @@
 obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o \
         hvcall.o proc.o htab.o iommu.o
-obj-$(CONFIG_PCI) += pci.o
+obj-$(CONFIG_PCI) += pci.o irq.o
diff --git a/arch/ppc64/kernel/iSeries_irq.c b/arch/powerpc/platforms/iseries/irq.c
index 0170682a8ca5..5a8a0056b31f 100644
--- a/arch/ppc64/kernel/iSeries_irq.c
+++ b/arch/powerpc/platforms/iseries/irq.c
@@ -363,4 +363,3 @@ void virt_irq_init(void)
 {
         return;
 }
-
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index 8473a8784567..2ff5d490e725 100644
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -16,8 +16,7 @@ obj-y += vdso32/ vdso64/
 
 obj-$(CONFIG_PPC_OF) += of_device.o
 
-pci-obj-$(CONFIG_PPC_ISERIES)   += iSeries_irq.o \
-                                iSeries_VpdInfo.o
+pci-obj-$(CONFIG_PPC_ISERIES)   += 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)