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/atarilance.c | |
| parent | c925f1ea9ec20a95d46f57810f4a4d69db74580e (diff) | |
| parent | d5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (diff) | |
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/atarilance.c')
| -rw-r--r-- | drivers/net/atarilance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c index 91783a8008be..465efe7a6c56 100644 --- a/drivers/net/atarilance.c +++ b/drivers/net/atarilance.c | |||
| @@ -1121,7 +1121,7 @@ static void set_multicast_list( struct net_device *dev ) | |||
| 1121 | 1121 | ||
| 1122 | if (dev->flags & IFF_PROMISC) { | 1122 | if (dev->flags & IFF_PROMISC) { |
| 1123 | /* Log any net taps. */ | 1123 | /* Log any net taps. */ |
| 1124 | DPRINTK( 1, ( "%s: Promiscuous mode enabled.\n", dev->name )); | 1124 | DPRINTK( 2, ( "%s: Promiscuous mode enabled.\n", dev->name )); |
| 1125 | REGA( CSR15 ) = 0x8000; /* Set promiscuous mode */ | 1125 | REGA( CSR15 ) = 0x8000; /* Set promiscuous mode */ |
| 1126 | } else { | 1126 | } else { |
| 1127 | short multicast_table[4]; | 1127 | short multicast_table[4]; |