diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-05-12 09:11:40 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-21 15:13:20 -0700 |
| commit | a0790b74a28e55380220f8afc732d3cc97c3c113 (patch) | |
| tree | ed3ffcb7494b6eb560b5f6d288e4605012f08b65 /drivers/video | |
| parent | b4c2a9797cd113ed9022341d3990303b3c7a2d7a (diff) | |
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>
Diffstat (limited to 'drivers/video')
0 files changed, 0 insertions, 0 deletions