]> git.baikalelectronics.ru Git - kernel.git/commit
mac8390: fix regression caused during net_device_ops conversion
authorFinn Thain <fthain@telegraphics.com.au>
Tue, 26 May 2009 05:43:49 +0000 (22:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 May 2009 05:43:49 +0000 (22:43 -0700)
commit0394a15c8c830a0e8ec040610b4e26bcae66b1b1
tree0b78f91f572f19014cb42b4b51f4a12c87d2cf48
parent1b1b275cc06aaa88226cc32202de6a37c86d2e54
mac8390: fix regression caused during net_device_ops conversion

Changeset f83fcfaacc5b12598077c8a50c1f65ecfa8fee9d ("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>
drivers/net/Makefile
drivers/net/mac8390.c