patch-2.3.13 linux/drivers/net/sunhme.c
Next file: linux/drivers/net/sunhme.h
Previous file: linux/drivers/net/sunbmac.c
Back to the patch index
Back to the overall index
- Lines: 15
- Date:
Mon Aug 9 11:29:37 1999
- Orig file:
v2.3.12/linux/drivers/net/sunhme.c
- Orig date:
Thu Jul 8 15:42:20 1999
diff -u --recursive --new-file v2.3.12/linux/drivers/net/sunhme.c linux/drivers/net/sunhme.c
@@ -3324,12 +3324,11 @@
qp->happy_meals[qfe_slot] = dev;
}
- hpreg_base = pdev->base_address[0];
- if((hpreg_base & PCI_BASE_ADDRESS_SPACE) != PCI_BASE_ADDRESS_SPACE_MEMORY) {
+ hpreg_base = pdev->resource[0].start;
+ if ((pdev->resource[0].flags & IORESOURCE_IOPORT) != 0) {
printk("happymeal(PCI): Cannot find proper PCI device base address.\n");
return ENODEV;
}
- hpreg_base &= PCI_BASE_ADDRESS_MEM_MASK;
if (qfe_slot != -1 && prom_getproplen(node, "local-mac-address") == 6)
prom_getproperty(node, "local-mac-address", dev->dev_addr, 6);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)