]> git.karo-electronics.de Git - karo-tx-linux.git/commit
ne-h8300: Fix regression caused during net_device_ops conversion
authorGeert Uytterhoeven <geert@linux-m68k.org>
Thu, 12 May 2011 09:11:40 +0000 (09:11 +0000)
committerAndi Kleen <ak@linux.intel.com>
Mon, 1 Aug 2011 20:54:48 +0000 (13:54 -0700)
commitf6f5ac3edfdc5b1f5595d0216b1ac6cc5448024c
tree2175ac2fa37033d3f8c8c8d53863b9900fc511b1
parent8eca68a77b9403beca2abebee81737c3fe423407
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>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
drivers/net/Makefile
drivers/net/ne-h8300.c