ne-h8300: Fix regression caused during net_device_ops conversion
commitba6528b3ec6d57dec0ab713659768e9d90d08f8e
authorGeert Uytterhoeven <geert@linux-m68k.org>
Thu, 12 May 2011 09:11:40 +0000 (12 09:11 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 23 May 2011 18:20:16 +0000 (23 11:20 -0700)
tree3b1ca973cb2edf336f6bf74fda282768df07aa86
parent23cd96edb58a1b64a97017c1b8ed70c1228a4a25
ne-h8300: Fix regression caused during net_device_ops conversion

commit 2592a7354092afd304a8c067319b15ab1e441e35 upstream.

Changeset dcd39c90290297f6e6ed8a04bb20da7ac2b043c5 ("ne-h8300: convert to
net_device_ops") broke ne-h8300 by adding 8390.o to the link. That
meant that lib8390.c was included twice, once in ne-h8300.c and once in
8390.c, subject to different macros. This patch reverts that by
avoiding the wrappers in 8390.c.

Fix based on commits 217cbfa856dc1cbc2890781626c4032d9e3ec59f ("mac8390:
fix regression caused during net_device_ops conversion") and
4e0168fa4842e27795a75b205a510f25b62181d9 ("mac8390: fix build with
NET_POLL_CONTROLLER").

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/net/Makefile
drivers/net/ne-h8300.c