patch-2.4.23 linux-2.4.23/arch/sparc64/kernel/pci_common.c
Next file: linux-2.4.23/arch/sparc64/kernel/pci_iommu.c
Previous file: linux-2.4.23/arch/sparc64/kernel/pci.c
Back to the patch index
Back to the overall index
- Lines: 17
- Date:
2003-11-28 10:26:19.000000000 -0800
- Orig file:
linux-2.4.22/arch/sparc64/kernel/pci_common.c
- Orig date:
2002-08-02 17:39:43.000000000 -0700
diff -urN linux-2.4.22/arch/sparc64/kernel/pci_common.c linux-2.4.23/arch/sparc64/kernel/pci_common.c
@@ -54,6 +54,7 @@
(pdev->vendor == PCI_VENDOR_ID_SUN) &&
(pdev->device == PCI_DEVICE_ID_SUN_PBM ||
pdev->device == PCI_DEVICE_ID_SUN_SCHIZO ||
+ pdev->device == PCI_DEVICE_ID_SUN_TOMATILLO ||
pdev->device == PCI_DEVICE_ID_SUN_SABRE ||
pdev->device == PCI_DEVICE_ID_SUN_HUMMINGBIRD)) {
*nregs = 0;
@@ -699,7 +700,7 @@
struct pcidev_cookie *pcp = pdev->sysdata;
struct pci_pbm_info *pbm = pcp->pbm;
struct pci_controller_info *p = pbm->parent;
- unsigned int portid = p->portid;
+ unsigned int portid = pbm->portid;
unsigned int prom_irq;
int prom_node = pcp->prom_node;
int err;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)