---

yaml --- r: 2502 b: refs/heads/master c: ea7190d h: refs/heads/master v: v3
git-mirror · Jun 22, 2005 · f992a2e · f992a2e
1 parent 2a55fb2
commit f992a2e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 109 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c670b1acd0ed0d9f7a27154759a9825cb5012ae4
+refs/heads/master: ea7190d0afebbd922eeb13ee6a8148b17964b1b2
diff --git a/trunk/arch/ppc64/kernel/Makefile b/trunk/arch/ppc64/kernel/Makefile
@@ -16,7 +16,7 @@ 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
 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)

diff --git a/trunk/arch/ppc64/kernel/iSeries_pci_reset.c b/trunk/arch/ppc64/kernel/iSeries_pci_reset.c
diff --git a/trunk/include/asm-ppc64/iSeries/iSeries_pci.h b/trunk/include/asm-ppc64/iSeries/iSeries_pci.h
@@ -92,7 +92,6 @@ struct iSeries_Device_Node {
 	int		DevFn;		/* Linux devfn */
 	int		BarOffset;
 	int		Irq;		/* Assigned IRQ */
-	int		ReturnCode;	/* Return Code Holder */
 	int		IoRetry;	/* Current Retry Count */
 	int		Flags;		/* Possible flags(disable/bist)*/
 	u16		Vendor;		/* Vendor ID */
@@ -107,7 +106,5 @@ struct iSeries_Device_Node {
 
 extern int	iSeries_Device_Information(struct pci_dev*, char*, int);
 extern void	iSeries_Get_Location_Code(struct iSeries_Device_Node*);
-extern int	iSeries_Device_ToggleReset(struct pci_dev* PciDev,
-		int AssertTime, int DelayTime);
 
 #endif /* _ISERIES_64_PCI_H */