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/eepro.c | |
parent | c925f1ea9ec20a95d46f57810f4a4d69db74580e (diff) | |
parent | d5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (diff) |
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/eepro.c')
-rw-r--r-- | drivers/net/eepro.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c index 8dc61d65dd23..bf9efa75390f 100644 --- a/drivers/net/eepro.c +++ b/drivers/net/eepro.c | |||
@@ -154,7 +154,7 @@ static const char version[] = | |||
154 | #include <asm/dma.h> | 154 | #include <asm/dma.h> |
155 | 155 | ||
156 | #define DRV_NAME "eepro" | 156 | #define DRV_NAME "eepro" |
157 | #define DRV_VERSION "0.13b" | 157 | #define DRV_VERSION "0.13c" |
158 | 158 | ||
159 | #define compat_dev_kfree_skb( skb, mode ) dev_kfree_skb( (skb) ) | 159 | #define compat_dev_kfree_skb( skb, mode ) dev_kfree_skb( (skb) ) |
160 | /* I had reports of looong delays with SLOW_DOWN defined as udelay(2) */ | 160 | /* I had reports of looong delays with SLOW_DOWN defined as udelay(2) */ |
@@ -1333,7 +1333,6 @@ set_multicast_list(struct net_device *dev) | |||
1333 | mode = inb(ioaddr + REG3); | 1333 | mode = inb(ioaddr + REG3); |
1334 | outb(mode, ioaddr + REG3); /* writing reg. 3 to complete the update */ | 1334 | outb(mode, ioaddr + REG3); /* writing reg. 3 to complete the update */ |
1335 | eepro_sw2bank0(ioaddr); /* Return to BANK 0 now */ | 1335 | eepro_sw2bank0(ioaddr); /* Return to BANK 0 now */ |
1336 | printk(KERN_INFO "%s: promiscuous mode enabled.\n", dev->name); | ||
1337 | } | 1336 | } |
1338 | 1337 | ||
1339 | else if (dev->mc_count==0 ) | 1338 | else if (dev->mc_count==0 ) |