patch-2.3.13 linux/drivers/net/sktr.c

• Lines: 63
• Date: Mon Aug 9 10:23:09 1999
• Orig file: v2.3.12/linux/drivers/net/sktr.c
• Orig date: Wed May 12 13:27:37 1999

diff -u --recursive --new-file v2.3.12/linux/drivers/net/sktr.c linux/drivers/net/sktr.c
@@ -186,7 +186,7 @@
  * If dev->base_addr == 0, probe all likely locations.
  * If dev->base_addr == 1, always return failure.
  */
-__initfunc(int sktr_probe(struct device *dev))
+int __init sktr_probe(struct device *dev)
 {
 	int i;
 	int base_addr = dev ? dev->base_addr : 0;
@@ -217,7 +217,7 @@
 /*
  * Detect and setup the PCI SysKonnect TR cards in slot order.
  */
-__initfunc(static int sktr_pci_chk_card(struct device *dev))
+static int __init sktr_pci_chk_card(struct device *dev)
 {
 	static int pci_index = 0;
 	unsigned char pci_bus, pci_device_fn;
@@ -246,7 +246,7 @@
 
 		pdev		= pci_find_slot(pci_bus, pci_device_fn);
 		pci_irq_line 	= pdev->irq;
-		pci_ioaddr 	= pdev->base_address[0];
+		pci_ioaddr 	= pdev->resource[0].start;
 
 		pcibios_read_config_word(pci_bus, pci_device_fn,
 						PCI_COMMAND, &pci_command);
@@ -295,7 +295,7 @@
 /*
  * Detect and setup the ISA SysKonnect TR cards.
  */
-__initfunc(static int sktr_isa_chk_card(struct device *dev, int ioaddr))
+static int __init sktr_isa_chk_card(struct device *dev, int ioaddr)
 {
 	int i, err;
 	unsigned long flags;
@@ -386,7 +386,7 @@
 	return (0);
 }
 
-__initfunc(static int sktr_probe1(struct device *dev, int ioaddr))
+static int __init sktr_probe1(struct device *dev, int ioaddr)
 {
 	static unsigned version_printed = 0;
 	struct net_local *tp;
@@ -428,7 +428,7 @@
 }
 
 /* Dummy function */
-__initfunc(static int sktr_init_card(struct device *dev))
+static int __init sktr_init_card(struct device *dev)
 {
 	if(sktr_debug > 3)
 		printk("%s: sktr_init_card\n", dev->name);
@@ -440,7 +440,7 @@
  * This function tests if an adapter is really installed at the
  * given I/O address. Return negative if no adapter at IO addr.
  */
-__initfunc(static int sktr_isa_chk_ioaddr(int ioaddr))
+static int __init sktr_isa_chk_ioaddr(int ioaddr)
 {
 	unsigned char old, chk1, chk2;