| commit | bb280235b350509a284469c2bab036c796a23b12 | |
| author | Finn Thain <fthain@telegraphics.com.au> | |
| Tue, 26 May 2009 05:43:49 +0000 (25 22:43 -0700) | ||
| committer | Greg Kroah-Hartman <gregkh@suse.de> | |
| Mon, 15 Jun 2009 16:39:54 +0000 (15 09:39 -0700) | ||
| tree | 4998b4a19e4c57e3b1865412e978d11a9d9851d6 | treesnapshot (tar.gz zip) |
| parent | 11f9c95f05a392a3f58362447197a1d1bc5302c7 | commitdiff |
mac8390: fix regression caused during net_device_ops conversion
[ Upstream commit 217cbfa856dc1cbc2890781626c4032d9e3ec59f ]
Changeset ca17584bf2ad1b1e37a5c0e4386728cc5fc9dabc ("mac8390: update
to net_device_ops") broke mac8390 by adding 8390.o to the link. That
meant that lib8390.c was included twice, once in mac8390.c and once in
8390.c, subject to different macros. This patch reverts that by
avoiding the wrappers in 8390.c. They seem to be of no value since
COMPAT_NET_DEV_OPS is going away soon.
Tested with a Kinetics EtherPort card.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
[ Upstream commit 217cbfa856dc1cbc2890781626c4032d9e3ec59f ]
Changeset ca17584bf2ad1b1e37a5c0e4386728cc5fc9dabc ("mac8390: update
to net_device_ops") broke mac8390 by adding 8390.o to the link. That
meant that lib8390.c was included twice, once in mac8390.c and once in
8390.c, subject to different macros. This patch reverts that by
avoiding the wrappers in 8390.c. They seem to be of no value since
COMPAT_NET_DEV_OPS is going away soon.
Tested with a Kinetics EtherPort card.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| drivers/net/Makefile | diffblobblamehistory | |
| drivers/net/mac8390.c | diffblobblamehistory |