diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:45:33 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:45:33 -0400 |
commit | 4e83b7fad8d3fd55828baa4510885c7362e66a26 (patch) | |
tree | eb3f28516c05a945f2e9c8003e5864de4e0763bc /drivers/net/epic100.c | |
parent | c925f1ea9ec20a95d46f57810f4a4d69db74580e (diff) | |
parent | d5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (diff) | |
download | kernel_samsung_espresso10-4e83b7fad8d3fd55828baa4510885c7362e66a26.zip kernel_samsung_espresso10-4e83b7fad8d3fd55828baa4510885c7362e66a26.tar.gz kernel_samsung_espresso10-4e83b7fad8d3fd55828baa4510885c7362e66a26.tar.bz2 |
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/epic100.c')
-rw-r--r-- | drivers/net/epic100.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index 25c4619..b885b20 100644 --- 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 |