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/amd8111e.c | |
| parent | c925f1ea9ec20a95d46f57810f4a4d69db74580e (diff) | |
| parent | d5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (diff) | |
| download | kernel_samsung_smdk4412-4e83b7fad8d3fd55828baa4510885c7362e66a26.zip kernel_samsung_smdk4412-4e83b7fad8d3fd55828baa4510885c7362e66a26.tar.gz kernel_samsung_smdk4412-4e83b7fad8d3fd55828baa4510885c7362e66a26.tar.bz2 | |
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/amd8111e.c')
| -rw-r--r-- | drivers/net/amd8111e.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index 2ef8e55..f83df12 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c @@ -101,9 +101,9 @@ Revision History: #include "amd8111e.h" #define MODULE_NAME "amd8111e" -#define MODULE_VERS "3.0.5" +#define MODULE_VERS "3.0.6" MODULE_AUTHOR("Advanced Micro Devices, Inc."); -MODULE_DESCRIPTION ("AMD8111 based 10/100 Ethernet Controller. Driver Version 3.0.3"); +MODULE_DESCRIPTION ("AMD8111 based 10/100 Ethernet Controller. Driver Version 3.0.6"); MODULE_LICENSE("GPL"); MODULE_DEVICE_TABLE(pci, amd8111e_pci_tbl); module_param_array(speed_duplex, int, NULL, 0); @@ -1527,7 +1527,6 @@ static void amd8111e_set_multicast_list(struct net_device *dev) u32 mc_filter[2] ; int i,bit_num; if(dev->flags & IFF_PROMISC){ - printk(KERN_INFO "%s: Setting promiscuous mode.\n",dev->name); writel( VAL2 | PROM, lp->mmio + CMD2); return; } |