patch-2.3.16 linux/drivers/atm/nicstar.c

• Lines: 18
• Date: Mon Aug 30 10:18:40 1999
• Orig file: v2.3.15/linux/drivers/atm/nicstar.c
• Orig date: Thu Aug 26 13:05:34 1999

diff -u --recursive --new-file v2.3.15/linux/drivers/atm/nicstar.c linux/drivers/atm/nicstar.c
@@ -344,7 +344,7 @@
 
 #else
 
-__initfunc(int nicstar_detect(void))
+int __init nicstar_detect(void)
 {
    int i;
    unsigned error = 0;	/* Initialized to remove compile warning */
@@ -454,7 +454,7 @@
       
    card->index = i;
    card->pcidev = pcidev;
-   card->membase = (u32) (pcidev->base_address[1] & PCI_BASE_ADDRESS_MEM_MASK);
+   card->membase = (u32) pcidev->resource[1].start;
 #ifdef __powerpc__
    /* Compensate for different memory map between host CPU and PCI bus.
       Shouldn't we use a macro for this? */