]> git.proxmox.com Git - mirror_ubuntu-disco-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)
commit0b25e0157dfa236a0629c16c8ad6f222f633f682
tree310c0de8776d9809526aedf0d637f217d157d08a
parentcf7e032fc87d59c475df26c4d40bf45d401b2adb
hydra: Fix regression caused during net_device_ops conversion

Changeset 5618f0d1193d6b051da9b59b0e32ad24397f06a4 ("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 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>
Cc: stable@kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/Makefile
drivers/net/hydra.c