patch-2.4.0-test2 linux/drivers/atm/nicstar.c

• Lines: 21
• Date: Tue Jun 20 13:58:42 2000
• Orig file: v2.4.0-test1/linux/drivers/atm/nicstar.c
• Orig date: Thu May 11 15:30:06 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/atm/nicstar.c linux/drivers/atm/nicstar.c
@@ -472,7 +472,7 @@
    card->index = i;
    card->atmdev = NULL;
    card->pcidev = pcidev;
-   card->membase = pcidev->resource[1].start;
+   card->membase = pci_resource_start(pcidev, 1);
 #ifdef __powerpc__
    /* Compensate for different memory map between host CPU and PCI bus.
       Shouldn't we use a macro for this? */
@@ -893,10 +893,9 @@
 #ifdef CONFIG_ATM_NICSTAR_USE_SUNI
    if (card->max_pcr == ATM_OC3_PCR) {
       suni_init(card->atmdev);
-#ifdef MODULE
+
       MOD_INC_USE_COUNT;
       /* Can't remove the nicstar driver or the suni driver would oops */
-#endif /* MODULE */
    }
 #endif /* CONFIG_ATM_NICSTAR_USE_SUNI */