Merge branch 'tmp' into upstream

[mirror_ubuntu-eoan-kernel.git] / drivers / net / epic100.c

diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index a67650ccf084acb7c215a11524fef25d0220aff9..b885b2029b4964d8c14a93dbc006bc0e2a4062d4 100644 (file)
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -26,8 +26,8 @@
 */
 
 #define DRV_NAME        "epic100"
-#define DRV_VERSION     "2.0"
-#define DRV_RELDATE     "June 27, 2006"
+#define DRV_VERSION     "2.1"
+#define DRV_RELDATE     "Sept 11, 2006"
 
 /* The user-configurable values.
    These may be modified when a driver module is loaded.*/
@@ -1386,7 +1386,6 @@ static void set_rx_mode(struct net_device *dev)
        if (dev->flags & IFF_PROMISC) {                 /* Set promiscuous. */
                outl(0x002C, ioaddr + RxCtrl);
                /* Unconditionally log net taps. */
-               printk(KERN_INFO "%s: Promiscuous mode enabled.\n", dev->name);
                memset(mc_filter, 0xff, sizeof(mc_filter));
        } else if ((dev->mc_count > 0)  ||  (dev->flags & IFF_ALLMULTI)) {
                /* There is apparently a chip bug, so the multicast filter
@@ -1604,7 +1603,7 @@ static int __init epic_init (void)
                version, version2, version3);
 #endif
 
-       return pci_module_init (&epic_driver);
+       return pci_register_driver(&epic_driver);
 }