summaryrefslogtreecommitdiff
path: root/drivers/net/pci-skeleton.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-12 19:45:33 +0400
committerJeff Garzik <jeff@garzik.org>2006-09-12 19:45:33 +0400
commit4e83b7fad8d3fd55828baa4510885c7362e66a26 (patch)
treeeb3f28516c05a945f2e9c8003e5864de4e0763bc /drivers/net/pci-skeleton.c
parentc925f1ea9ec20a95d46f57810f4a4d69db74580e (diff)
parentd5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (diff)
downloadlinux-4e83b7fad8d3fd55828baa4510885c7362e66a26.tar.xz
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/pci-skeleton.c')
-rw-r--r--drivers/net/pci-skeleton.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c
index e6347620529e..dea843a62d32 100644
--- a/drivers/net/pci-skeleton.c
+++ b/drivers/net/pci-skeleton.c
@@ -98,7 +98,7 @@ IVc. Errata
#include <linux/crc32.h>
#include <asm/io.h>
-#define NETDRV_VERSION "1.0.0"
+#define NETDRV_VERSION "1.0.1"
#define MODNAME "netdrv"
#define NETDRV_DRIVER_LOAD_MSG "MyVendor Fast Ethernet driver " NETDRV_VERSION " loaded"
#define PFX MODNAME ": "
@@ -1853,9 +1853,6 @@ static void netdrv_set_rx_mode (struct net_device *dev)
/* Note: do not reorder, GCC is clever about common statements. */
if (dev->flags & IFF_PROMISC) {
- /* Unconditionally log net taps. */
- printk (KERN_NOTICE "%s: Promiscuous mode enabled.\n",
- dev->name);
rx_mode =
AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
AcceptAllPhys;