diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:45:11 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:45:11 -0400 |
| commit | 846050dd49719b1f68248807bba5c27bfc86f81a (patch) | |
| tree | 79922936e8cde867ba90d753f79aa61f575e162b /drivers/net/tulip | |
| parent | 49666145de54b5d6d256442bb1bec03ffae1ac76 (diff) | |
| parent | 2ca2d5e84c19ddbc0126087af6288533a05f1799 (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net/tulip')
| -rw-r--r-- | drivers/net/tulip/winbond-840.c | 2 | ||||
| -rw-r--r-- | drivers/net/tulip/xircom_cb.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index 7f414815cc62..eba9083da146 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c @@ -138,7 +138,7 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; #include <asm/irq.h> /* These identify the driver base version and may not be removed. */ -static char version[] __devinitdata = +static char version[] = KERN_INFO DRV_NAME ".c:v" DRV_VERSION " (2.4 port) " DRV_RELDATE " Donald Becker <becker@scyld.com>\n" KERN_INFO " http://www.scyld.com/network/drivers.html\n"; diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c index f874e4f6ccf6..cf43390d2c80 100644 --- a/drivers/net/tulip/xircom_cb.c +++ b/drivers/net/tulip/xircom_cb.c @@ -1264,8 +1264,7 @@ static void investigate_write_descriptor(struct net_device *dev, struct xircom_p static int __init xircom_init(void) { - pci_register_driver(&xircom_ops); - return 0; + return pci_register_driver(&xircom_ops); } static void __exit xircom_exit(void) |