---

yaml --- r: 11493 b: refs/heads/master c: cb4cf80 h: refs/heads/master i: 11491: 9ba8ef8 v: v3
git-mirror · Sep 27, 2005 · 37bdbf4 · 37bdbf4
1 parent f8f3e56
commit 37bdbf4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d387899f3f7092edbafe16d69ea9737846473e99
+refs/heads/master: cb4cf8056ead24ef0595859952319e2a608d5e07
diff --git a/trunk/arch/powerpc/platforms/iseries/Makefile b/trunk/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/trunk/arch/ppc64/kernel/iSeries_irq.c → trunk/arch/powerpc/platforms/iseries/irq.c b/trunk/arch/ppc64/kernel/iSeries_irq.c → trunk/arch/powerpc/platforms/iseries/irq.c
@@ -363,4 +363,3 @@ void virt_irq_init(void)
 {
 	return;
 }
-
diff --git a/trunk/arch/ppc64/kernel/Makefile b/trunk/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)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -363,4 +363,3 @@ void virt_irq_init(void)
		{
		return;
		}