Geert Uytterhoeven
cf7e032fc8
zorro8390: Fix regression caused during net_device_ops conversion
...
Changeset b6114794a1 ("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 217cbfa856 ("mac8390:
fix regression caused during net_device_ops conversion") and
4e0168fa48 ("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>
2011-05-12 16:59:57 -04:00
..
accessibility
acpi
Fix common misspellings
2011-03-31 11:26:23 -03:00
amba
Fix common misspellings
2011-03-31 11:26:23 -03:00
ata
Fix common misspellings
2011-03-31 11:26:23 -03:00
atm
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
2011-04-07 11:14:49 -07:00
auxdisplay
Fix common misspellings
2011-03-31 11:26:23 -03:00
base
Fix common misspellings
2011-03-31 11:26:23 -03:00
block
Fix common misspellings
2011-03-31 11:26:23 -03:00
bluetooth
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
2011-04-07 11:14:49 -07:00
cdrom
Fix common misspellings
2011-03-31 11:26:23 -03:00
char
Fix common misspellings
2011-03-31 11:26:23 -03:00
clk
clocksource
connector
connector: fix skb double free in cn_rx_skb()
2011-04-12 14:38:57 -07:00
cpufreq
Fix common misspellings
2011-03-31 11:26:23 -03:00
cpuidle
crypto
Fix common misspellings
2011-03-31 11:26:23 -03:00
dca
drivers/dca/dca-core.c: use list_move() instead of list_del()/list_add() combination
2011-03-22 17:44:12 -07:00
dio
dma
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
2011-04-07 12:48:45 -07:00
edac
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
2011-04-07 11:14:49 -07:00
eisa
firewire
Fix common misspellings
2011-03-31 11:26:23 -03:00
firmware
sigma-firmware: loader for Analog Devices' SigmaStudio
2011-03-22 17:44:15 -07:00
gpio
Fix common misspellings
2011-03-31 11:26:23 -03:00
gpu
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
2011-04-07 11:14:49 -07:00
hid
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
2011-04-07 11:14:49 -07:00
hwmon
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
2011-04-07 11:14:49 -07:00
hwspinlock
hwspinlock: depend on OMAP4
2011-03-18 17:15:11 -07:00
i2c
Fix common misspellings
2011-03-31 11:26:23 -03:00
ide
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
2011-04-07 11:14:49 -07:00
idle
ieee802154
ieee802154: change to new flag variable
2011-03-17 14:05:34 +01:00
infiniband
Fix common misspellings
2011-03-31 11:26:23 -03:00
input
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
2011-04-07 11:14:49 -07:00
isdn
Fix common misspellings
2011-03-31 11:26:23 -03:00
leds
Fix common misspellings
2011-03-31 11:26:23 -03:00
lguest
Fix common misspellings
2011-03-31 11:26:23 -03:00
macintosh
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
2011-04-07 11:14:49 -07:00
mca
md
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
2011-04-07 11:14:49 -07:00
media
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
2011-04-07 11:14:49 -07:00
memstick
Fix common misspellings
2011-03-31 11:26:23 -03:00
message
Fix common misspellings
2011-03-31 11:26:23 -03:00
mfd
Fix common misspellings
2011-03-31 11:26:23 -03:00
misc
Fix common misspellings
2011-03-31 11:26:23 -03:00
mmc
Fix common misspellings
2011-03-31 11:26:23 -03:00
mtd
Merge git://git.infradead.org/mtd-2.6
2011-04-09 13:23:50 -07:00
net
zorro8390: Fix regression caused during net_device_ops conversion
2011-05-12 16:59:57 -04:00
nfc
nubus
of
Fix common misspellings
2011-03-31 11:26:23 -03:00
oprofile
parisc
Fix common misspellings
2011-03-31 11:26:23 -03:00
parport
Fix common misspellings
2011-03-31 11:26:23 -03:00
pci
pci: fix PCI bus allocation alignment handling
2011-04-11 10:53:11 -07:00
pcmcia
Fix common misspellings
2011-03-31 11:26:23 -03:00
platform
Fix common misspellings
2011-03-31 11:26:23 -03:00
pnp
Fix common misspellings
2011-03-31 11:26:23 -03:00
power
drivers: Final irq namespace conversion
2011-03-29 14:48:19 +02:00
pps
Fix common misspellings
2011-03-31 11:26:23 -03:00
ps3
Fix common misspellings
2011-03-31 11:26:23 -03:00
rapidio
Fix common misspellings
2011-03-31 11:26:23 -03:00
regulator
Fix common misspellings
2011-03-31 11:26:23 -03:00
rtc
Merge branches 'x86-fixes-for-linus', 'sched-fixes-for-linus', 'timers-fixes-for-linus', 'irq-fixes-for-linus' and 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-04-07 12:12:58 -07:00
s390
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
2011-04-08 07:36:14 -07:00
sbus
Fix common misspellings
2011-03-31 11:26:23 -03:00
scsi
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
2011-04-07 11:14:49 -07:00
sfi
Fix common misspellings
2011-03-31 11:26:23 -03:00
sh
sh: Fix irq cleanup fallout
2011-03-30 00:15:49 +02:00
sn
spi
Fix common misspellings
2011-03-31 11:26:23 -03:00
ssb
Fix common misspellings
2011-03-31 11:26:23 -03:00
staging
Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
2011-04-07 11:36:44 -07:00
target
Fix common misspellings
2011-03-31 11:26:23 -03:00
tc
telephony
Fix common misspellings
2011-03-31 11:26:23 -03:00
thermal
tty
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
2011-04-07 12:48:45 -07:00
uio
Fix common misspellings
2011-03-31 11:26:23 -03:00
usb
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
2011-04-07 11:14:49 -07:00
uwb
Fix common misspellings
2011-03-31 11:26:23 -03:00
vhost
vhost-net: remove unlocked use of receive_queue
2011-03-13 23:08:19 +02:00
video
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
2011-04-07 12:49:17 -07:00
virtio
vlynq
vlynq: Convert irq functions
2011-03-28 19:33:04 +02:00
w1
Fix common misspellings
2011-03-31 11:26:23 -03:00
watchdog
watchdog: mpc8xxx_wdt: fix build
2011-04-07 20:20:24 +00:00
xen
Fix common misspellings
2011-03-31 11:26:23 -03:00
zorro
Kconfig
Makefile