Linker error on via-velocity driver
Hi there! I found a bug in the via-velocity driver, but I cant find a maintainer for that, so I write to the lists. This driver depends on CONFIG_INET (tcp/ip) if CONFIG_PM is enabled. This is tested on i386 and x86_64. I'm not familiar with network stuff but I don't believe a device should depend on a protocol. If you are interested to fix it: make allnoconfig enable CONFIG_PCI enable CONFIG_NET enable CONFIG_NET_ETHERNET enable CONFIG_NET_PCI enable CONFIG_VIA_VELOCITY make That only happens when CONFIG_PM is enabled. If it's switched off it won't happen. Greets, Henne - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] [NET] [TG3] Convert the pci_device_it table to PCI_DEVICE()
From: Henrik Kretzschmar [EMAIL PROTECTED]
Convert the pci_device_ids to PCI_DEVICE() macro.
Saves 1.5k in the sourcefile.
Signed-off-by: Henrik Kretzschmar [EMAIL PROTECTED]
---
diff -ruN linux-2.6.18-rc2-git6/drivers/net/tg3.c linux/drivers/net/tg3.c
--- linux-2.6.18-rc2-git6/drivers/net/tg3.c 2006-07-30 23:57:12.0
+0200
+++ linux/drivers/net/tg3.c 2006-08-01 22:48:41.0 +0200
@@ -152,117 +152,62 @@
MODULE_PARM_DESC(tg3_debug, Tigon3 bitmapped debugging message enable value);
static struct pci_device_id tg3_pci_tbl[] = {
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5700,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5701,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5702,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5703,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5704,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5702FE,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5705,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5705_2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5705M,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5705M_2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5702X,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5703X,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5704S,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5702A3,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5703A3,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5782,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5788,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5789,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5901,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5901_2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5704S_2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5705F,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5720,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5721,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5750,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5750M,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751M,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751F,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5752,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5752M,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5753,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5753M,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5753F,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5754,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5754M,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5755,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5755M,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5786,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5787,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5787M,
- PCI_ANY_ID,
[PATCH] [NET] [VELOCITY] remove an unused function from the header
From: Henrik Kretzschmar [EMAIL PROTECTED]
Removes an unused function from the via-velocity-driver.
It doesn't make the binary smaller, but the source cleaner.
Signed-off-by: Henrik Kretzschmar [EMAIL PROTECTED]
---
--- linux-2.6.18-rc2-git6/drivers/net/via-velocity.h2006-07-30
23:25:59.0 +0200
+++ linux/drivers/net/via-velocity.h2006-08-07 15:24:54.0 +0200
@@ -262,25 +262,6 @@
dma_addr_t skb_dma;
};
-/**
- * alloc_rd_info - allocate an rd info block
- *
- * Alocate and initialize a receive info structure used for keeping
- * track of kernel side information related to each receive
- * descriptor we are using
- */
-
-static inline struct velocity_rd_info *alloc_rd_info(void)
-{
- struct velocity_rd_info *ptr;
- if ((ptr = kmalloc(sizeof(struct velocity_rd_info), GFP_ATOMIC)) ==
NULL)
- return NULL;
- else {
- memset(ptr, 0, sizeof(struct velocity_rd_info));
- return ptr;
- }
-}
-
/*
* Used to track transmit side buffers.
*/
-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
[NET] initialisation cleanup for ULI526x-net-driver
From: Henrik Kretzschmar [EMAIL PROTECTED]
[NET] initialisation cleanup for ULI526x-net-driver
removes the unneeded local variable rc
replace pci_module_init() with pci_register_driver()
two coding style issues on switch
Signed-off-by: Henrik Kretzschmar [EMAIL PROTECTED]
---
diff -ruN linux-2.6.18-rc2-git2/drivers/net/tulip/uli526x.c
linux/drivers/net/tulip/uli526x.c
--- linux-2.6.18-rc2-git2/drivers/net/tulip/uli526x.c 2006-07-24
13:58:05.0 +0200
+++ linux/drivers/net/tulip/uli526x.c 2006-07-24 14:21:43.0 +0200
@@ -1702,7 +1702,6 @@
static int __init uli526x_init_module(void)
{
- int rc;
printk(version);
printed_version = 1;
@@ -1714,22 +1713,19 @@
if (cr6set)
uli526x_cr6_user_set = cr6set;
- switch(mode) {
+ switch (mode) {
case ULI526X_10MHF:
case ULI526X_100MHF:
case ULI526X_10MFD:
case ULI526X_100MFD:
uli526x_media_mode = mode;
break;
- default:uli526x_media_mode = ULI526X_AUTO;
+ default:
+ uli526x_media_mode = ULI526X_AUTO;
break;
}
- rc = pci_module_init(uli526x_driver);
- if (rc 0)
- return rc;
-
- return 0;
+ return pci_register_driver(uli526x_driver);
}
-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
[NET] initialisation cleanup for ULI526x-net-driver 2nd(mailer issue)
From: Henrik Kretzschmar [EMAIL PROTECTED]
[NET] initialisation cleanup for ULI526x-net-driver
removes the unneeded local variable rc
replace pci_module_init() with pci_register_driver()
two coding style issues on switch
Signed-off-by: Henrik Kretzschmar [EMAIL PROTECTED]
---
diff -ruN linux-2.6.18-rc2-git2/drivers/net/tulip/uli526x.c
linux/drivers/net/tulip/uli526x.c
--- linux-2.6.18-rc2-git2/drivers/net/tulip/uli526x.c 2006-07-24
13:58:05.0 +0200
+++ linux/drivers/net/tulip/uli526x.c 2006-07-24 14:21:43.0 +0200
@@ -1702,7 +1702,6 @@
static int __init uli526x_init_module(void)
{
- int rc;
printk(version);
printed_version = 1;
@@ -1714,22 +1713,19 @@
if (cr6set)
uli526x_cr6_user_set = cr6set;
- switch(mode) {
+ switch (mode) {
case ULI526X_10MHF:
case ULI526X_100MHF:
case ULI526X_10MFD:
case ULI526X_100MFD:
uli526x_media_mode = mode;
break;
- default:uli526x_media_mode = ULI526X_AUTO;
+ default:
+ uli526x_media_mode = ULI526X_AUTO;
break;
}
- rc = pci_module_init(uli526x_driver);
- if (rc 0)
- return rc;
-
- return 0;
+ return pci_register_driver(uli526x_driver);
}
-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH][NET] ULi526x - driver cleanups
From: Henrik Kretzschmar [EMAIL PROTECTED]
Some little cleanups for ULI-TULIP-driver:
pci_module_init() conversion to pci_register_driver()
remove rc, an unneeded variable from uli526x_module_init()
let the debug macros use correct loglevels
add a loglevel to a printk
let some code more look like CodingStyle
Signed-off-by: Henrik Kretzschmar [EMAIL PROTECTED]
---
--- linux-2.6.18-rc2/drivers/net/tulip/uli526x.c2006-07-18
13:37:09.0 +0200
+++ linux/drivers/net/tulip/uli526x.c 2006-07-20 11:43:07.0 +0200
@@ -82,9 +82,9 @@
#define ULI526X_TX_TIMEOUT ((16*HZ)/2) /* tx packet time-out time 8 s */
#define ULI526X_TX_KICK(4*HZ/2)/* tx packet Kick-out time 2 s
*/
-#define ULI526X_DBUG(dbug_now, msg, value) if (uli526x_debug || (dbug_now))
printk(KERN_ERR DRV_NAME : %s %lx\n, (msg), (long) (value))
+#define ULI526X_DBUG(dbug_now, msg, value) if (uli526x_debug || (dbug_now))
printk(KERN_DEBUG DRV_NAME : %s %lx\n, (msg), (long) (value))
-#define SHOW_MEDIA_TYPE(mode) printk(KERN_ERR DRV_NAME : Change Speed to
%sMhz %s duplex\n,mode 1 ?100:10, mode 4 ? full:half);
+#define SHOW_MEDIA_TYPE(mode) printk(KERN_NOTICE DRV_NAME : Change Speed to
%sMhz %s duplex\n,mode 1 ?100:10, mode 4 ? full:half);
/* CR9 definition: SROM/MII */
@@ -373,7 +373,8 @@
if (err)
goto err_out_res;
- printk(KERN_INFO %s: ULi M%04lx at pci%s,,dev-name,ent-driver_data
16,pci_name(pdev));
+ printk(KERN_INFO %s: ULi M%04lx at pci%s,,dev-name,
+ ent-driver_data 16,pci_name(pdev));
for (i = 0; i 6; i++)
printk(%c%02x, i ? ':' : ' ', dev-dev_addr[i]);
@@ -1027,7 +1028,7 @@
if ( time_after(jiffies, dev-trans_start + ULI526X_TX_TIMEOUT)
) {
db-reset_TXtimeout++;
db-wait_reset = 1;
- printk( %s: Tx timeout - resetting\n,
+ printk(KERN_ERR %s: Tx timeout - resetting\n,
dev-name);
}
}
@@ -1671,18 +1672,17 @@
static struct pci_device_id uli526x_pci_tbl[] = {
- { 0x10B9, 0x5261, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_ULI5261_ID },
- { 0x10B9, 0x5263, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_ULI5263_ID },
- { 0, }
+ {0x10B9, 0x5261, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_ULI5261_ID},
+ {0x10B9, 0x5263, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_ULI5263_ID},
+ {}
};
MODULE_DEVICE_TABLE(pci, uli526x_pci_tbl);
-
static struct pci_driver uli526x_driver = {
- .name = uli526x,
- .id_table = uli526x_pci_tbl,
- .probe = uli526x_init_one,
- .remove = __devexit_p(uli526x_remove_one),
+ .name = uli526x,
+ .id_table = uli526x_pci_tbl,
+ .probe = uli526x_init_one,
+ .remove = __devexit_p(uli526x_remove_one),
};
MODULE_AUTHOR(Peer Chen, [EMAIL PROTECTED]);
@@ -1702,7 +1702,6 @@
static int __init uli526x_init_module(void)
{
- int rc;
printk(version);
printed_version = 1;
@@ -1714,25 +1713,21 @@
if (cr6set)
uli526x_cr6_user_set = cr6set;
- switch(mode) {
+ switch (mode) {
case ULI526X_10MHF:
case ULI526X_100MHF:
case ULI526X_10MFD:
case ULI526X_100MFD:
uli526x_media_mode = mode;
break;
- default:uli526x_media_mode = ULI526X_AUTO;
+ default:
+ uli526x_media_mode = ULI526X_AUTO;
break;
}
- rc = pci_module_init(uli526x_driver);
- if (rc 0)
- return rc;
-
- return 0;
+ return pci_register_driver(uli526x_driver);
}
-
/*
* Description:
* when user used rmmod to delete module, system invoked clean_module()
-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] [NET] pci_module_init() removal on some net-drivers
From: Henrik Kretzschmar [EMAIL PROTECTED]
Removes pci_module_init() from 56 net-subsys-drivers and replaces it with
pci_register_driver(), if the initialistion function just returns the
return value of those functions.
There are still some pci_module_init() left in the net drivers which require
a closer look.
Signed-off-by: Henrik Kretzschmar [EMAIL PROTECTED]
---
diff -ruN linux-2.6.18-rc2/drivers/net/8139cp.c linux/drivers/net/8139cp.c
--- linux-2.6.18-rc2/drivers/net/8139cp.c 2006-07-18 13:37:07.0
+0200
+++ linux/drivers/net/8139cp.c 2006-07-19 17:41:08.0 +0200
@@ -2098,7 +2098,7 @@
#ifdef MODULE
printk(%s, version);
#endif
- return pci_module_init (cp_driver);
+ return pci_register_driver(cp_driver);
}
static void __exit cp_exit (void)
diff -ruN linux-2.6.18-rc2/drivers/net/8139too.c linux/drivers/net/8139too.c
--- linux-2.6.18-rc2/drivers/net/8139too.c 2006-07-18 13:37:07.0
+0200
+++ linux/drivers/net/8139too.c 2006-07-19 17:40:35.0 +0200
@@ -2629,7 +2629,7 @@
printk (KERN_INFO RTL8139_DRIVER_NAME \n);
#endif
- return pci_module_init (rtl8139_pci_driver);
+ return pci_register_driver(rtl8139_pci_driver);
}
diff -ruN linux-2.6.18-rc2/drivers/net/acenic.c linux/drivers/net/acenic.c
--- linux-2.6.18-rc2/drivers/net/acenic.c 2006-07-18 13:37:07.0
+0200
+++ linux/drivers/net/acenic.c 2006-07-19 16:45:07.0 +0200
@@ -725,7 +725,7 @@
static int __init acenic_init(void)
{
- return pci_module_init(acenic_pci_driver);
+ return pci_register_driver(acenic_pci_driver);
}
static void __exit acenic_exit(void)
diff -ruN linux-2.6.18-rc2/drivers/net/amd8111e.c linux/drivers/net/amd8111e.c
--- linux-2.6.18-rc2/drivers/net/amd8111e.c 2006-07-18 13:37:07.0
+0200
+++ linux/drivers/net/amd8111e.c2006-07-19 17:40:08.0 +0200
@@ -2158,7 +2158,7 @@
static int __init amd8111e_init(void)
{
- return pci_module_init(amd8111e_driver);
+ return pci_register_driver(amd8111e_driver);
}
static void __exit amd8111e_cleanup(void)
diff -ruN linux-2.6.18-rc2/drivers/net/arcnet/com20020-pci.c
linux/drivers/net/arcnet/com20020-pci.c
--- linux-2.6.18-rc2/drivers/net/arcnet/com20020-pci.c 2006-07-18
13:37:07.0 +0200
+++ linux/drivers/net/arcnet/com20020-pci.c 2006-07-19 17:39:43.0
+0200
@@ -177,7 +177,7 @@
static int __init com20020pci_init(void)
{
BUGLVL(D_NORMAL) printk(VERSION);
- return pci_module_init(com20020pci_driver);
+ return pci_register_driver(com20020pci_driver);
}
static void __exit com20020pci_cleanup(void)
diff -ruN linux-2.6.18-rc2/drivers/net/b44.c linux/drivers/net/b44.c
--- linux-2.6.18-rc2/drivers/net/b44.c 2006-07-18 13:37:07.0 +0200
+++ linux/drivers/net/b44.c 2006-07-19 17:38:59.0 +0200
@@ -2354,7 +2354,7 @@
dma_desc_align_mask = ~(dma_desc_align_size - 1);
dma_desc_sync_size = max_t(unsigned int, dma_desc_align_size,
sizeof(struct dma_desc));
- return pci_module_init(b44_driver);
+ return pci_register_driver(b44_driver);
}
static void __exit b44_cleanup(void)
diff -ruN linux-2.6.18-rc2/drivers/net/bnx2.c linux/drivers/net/bnx2.c
--- linux-2.6.18-rc2/drivers/net/bnx2.c 2006-07-18 13:37:07.0 +0200
+++ linux/drivers/net/bnx2.c2006-07-19 17:38:00.0 +0200
@@ -6015,7 +6015,7 @@
static int __init bnx2_init(void)
{
- return pci_module_init(bnx2_pci_driver);
+ return pci_register_driver(bnx2_pci_driver);
}
static void __exit bnx2_cleanup(void)
diff -ruN linux-2.6.18-rc2/drivers/net/cassini.c linux/drivers/net/cassini.c
--- linux-2.6.18-rc2/drivers/net/cassini.c 2006-07-18 13:37:07.0
+0200
+++ linux/drivers/net/cassini.c 2006-07-19 17:37:18.0 +0200
@@ -5245,7 +5245,7 @@
else
link_transition_timeout = 0;
- return pci_module_init(cas_driver);
+ return pci_register_driver(cas_driver);
}
static void __exit cas_cleanup(void)
diff -ruN linux-2.6.18-rc2/drivers/net/chelsio/cxgb2.c
linux/drivers/net/chelsio/cxgb2.c
--- linux-2.6.18-rc2/drivers/net/chelsio/cxgb2.c2006-07-18
13:37:07.0 +0200
+++ linux/drivers/net/chelsio/cxgb2.c 2006-07-19 17:36:38.0 +0200
@@ -1243,7 +1243,7 @@
static int __init t1_init_module(void)
{
- return pci_module_init(driver);
+ return pci_register_driver(driver);
}
static void __exit t1_cleanup_module(void)
diff -ruN linux-2.6.18-rc2/drivers/net/dl2k.c linux/drivers/net/dl2k.c
--- linux-2.6.18-rc2/drivers/net/dl2k.c 2006-07-18 13:37:07.0 +0200
+++ linux/drivers/net/dl2k.c2006-07-19 17:35:37.0 +0200
@@ -1815,7 +1815,7 @@
static int __init
rio_init (void)
{
- return pci_module_init (rio_driver);
+ return pci_register_driver(rio_driver);
}
static void __exit
diff -ruN linux-2.6.18-rc2/drivers/net/eepro100.c
