Merge branch 'tmp' into upstream

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 68d8af7df08e..fbda7614d0ef 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -28,7 +28,7 @@
  */
 
 #define IOC3_NAME       "ioc3-eth"
-#define IOC3_VERSION    "2.6.3-3"
+#define IOC3_VERSION    "2.6.3-4"
 
 #include <linux/init.h>
 #include <linux/delay.h>
@@ -1611,8 +1611,6 @@ static void ioc3_set_multicast_list(struct net_device *dev)
         netif_stop_queue(dev);                          /* Lock out others. */
 
         if (dev->flags & IFF_PROMISC) {                 /* Set promiscuous.  */
-                /* Unconditionally log net taps.  */
-                printk(KERN_INFO "%s: Promiscuous mode enabled.\n", dev->name);
                 ip->emcr |= EMCR_PROMISC;
                 ioc3_w_emcr(ip->emcr);
                 (void) ioc3_r_emcr();