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/ariadne.c | |
| parent | c925f1ea9ec20a95d46f57810f4a4d69db74580e (diff) | |
| parent | d5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (diff) | |
| download | linux-4e83b7fad8d3fd55828baa4510885c7362e66a26.tar.gz linux-4e83b7fad8d3fd55828baa4510885c7362e66a26.tar.bz2 linux-4e83b7fad8d3fd55828baa4510885c7362e66a26.zip | |
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/ariadne.c')
| -rw-r--r-- | drivers/net/ariadne.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c index cc721addd576..3aef3c10d56f 100644 --- a/drivers/net/ariadne.c +++ b/drivers/net/ariadne.c @@ -825,8 +825,6 @@ static void set_multicast_list(struct net_device *dev) ariadne_init_ring(dev); if (dev->flags & IFF_PROMISC) { - /* Log any net taps. */ - printk(KERN_INFO "%s: Promiscuous mode enabled.\n", dev->name); lance->RAP = CSR15; /* Mode Register */ lance->RDP = PROM; /* Set promiscuous mode */ } else { |