]> git.baikalelectronics.ru Git - kernel.git/commit
zorro8390: Fix regression caused during net_device_ops conversion
authorGeert Uytterhoeven <geert@linux-m68k.org>
Thu, 12 May 2011 09:11:38 +0000 (09:11 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 12 May 2011 20:59:57 +0000 (16:59 -0400)
commite86399f88fb42537dce12e64503791e1e9b9b87a
tree31950f192e6c3bae94db497b97d43011461e2d80
parent5a994bfdfdb5a6b3fce390196ee0a627dcc7e9cc
zorro8390: Fix regression caused during net_device_ops conversion

Changeset e2dd27d055a913342737e6ed1b500c122459134b ("zorro8390: convert to
net_device_ops") broke zorro8390 by adding 8390.o to the link. That
meant that lib8390.c was included twice, once in zorro8390.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 0394a15c8c830a0e8ec040610b4e26bcae66b1b1 ("mac8390:
fix regression caused during net_device_ops conversion") and
aa812ad73026e12e553c9c339685c35c7145d403 ("mac8390: fix build with
NET_POLL_CONTROLLER").

Reported-by: Christian T. Steigies <cts@debian.org>
Suggested-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Tested-by: Christian T. Steigies <cts@debian.org>
Cc: stable@kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/Makefile
drivers/net/zorro8390.c