summaryrefslogtreecommitdiffstats
path: root/drivers/net/8139cp.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-12 17:45:33 +0200
committerJeff Garzik <jeff@garzik.org>2006-09-12 17:45:33 +0200
commit4e83b7fad8d3fd55828baa4510885c7362e66a26 (patch)
treeeb3f28516c05a945f2e9c8003e5864de4e0763bc /drivers/net/8139cp.c
parentMerge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linv... (diff)
parent[PATCH] Remove more unnecessary driver printk's (diff)
downloadlinux-4e83b7fad8d3fd55828baa4510885c7362e66a26.tar.xz
linux-4e83b7fad8d3fd55828baa4510885c7362e66a26.zip
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/8139cp.c')
-rw-r--r--drivers/net/8139cp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 4c2e76326c4a..4cdb6b2efb9a 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -48,7 +48,7 @@
*/
#define DRV_NAME "8139cp"
-#define DRV_VERSION "1.2"
+#define DRV_VERSION "1.3"
#define DRV_RELDATE "Mar 22, 2004"
@@ -942,8 +942,6 @@ static void __cp_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;