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

Changeset d245e045088e65ecb915656aba25c6b68ca3414b ("hydra: convert to
net_device_ops") broke hydra by adding 8390.o to the link. That
meant that lib8390.c was included twice, once in hydra.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/hydra.c