]> git.baikalelectronics.ru Git - kernel.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)
committerDavid S. Miller <davem@davemloft.net>
Thu, 12 May 2011 20:59:57 +0000 (16:59 -0400)
commit9dd8ed352752928ee0318f16b4f186d80ca92302
tree9f011e276c70fdac0368698b3e30edd31d5ea97b
parente7991d16d7fcb32f6d850f0a6ecd87cb9afc66a2
ne-h8300: Fix regression caused during net_device_ops conversion

Changeset c0b6497562e8a93390de3ff12db3ca5767111e5e ("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 0394a15c8c830a0e8ec040610b4e26bcae66b1b1 ("mac8390:
fix regression caused during net_device_ops conversion") and
aa812ad73026e12e553c9c339685c35c7145d403 ("mac8390: fix build with
NET_POLL_CONTROLLER").

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: stable@kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/Makefile
drivers/net/ne-h8300.c