openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'arm-build-fixes' 

Arnd Bergmann says:

====================
net: driver fixes from arm randconfig builds

These four patches are fallout from test builds on ARM. I have a
few more of them in my backlog but have not yet confirmed them
to still be valid.

The first three patches are about incomplete dependencies on
old drivers. One could backport them to the beginning of time
in theory, but there is little value since nobody would run into
these problems.

The final patch is one I had submitted before together with the
respective pcmcia patch but forgot to follow up on that. It's
still a valid but relatively theoretical bug, because the previous
behavior of the driver was just as broken as what we have in
mainline.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2015-01-29 15:08:27 -08:00
parent e2a4800e75 96a30175f9
commit a1a0b558ce
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/amd/Kconfig
View File

@ -45,7 +45,7 @@ config AMD8111_ETH
config LANCE config LANCE
tristate "AMD LANCE and PCnet (AT1500 and NE2100) support" tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"
depends on ISA && ISA_DMA_API depends on ISA && ISA_DMA_API && !ARM
---help--- ---help---
If you have a network (Ethernet) card of this type, say Y and read If you have a network (Ethernet) card of this type, say Y and read
the Ethernet-HOWTO, available from the Ethernet-HOWTO, available from
@ -142,7 +142,7 @@ config PCMCIA_NMCLAN
config NI65 config NI65
tristate "NI6510 support" tristate "NI6510 support"
depends on ISA && ISA_DMA_API depends on ISA && ISA_DMA_API && !ARM
---help--- ---help---
If you have a network (Ethernet) card of this type, say Y and read If you have a network (Ethernet) card of this type, say Y and read
the Ethernet-HOWTO, available from the Ethernet-HOWTO, available from

2
drivers/net/ethernet/amd/nmclan_cs.c
View File

@ -952,6 +952,8 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)
do { do {
/* WARNING: MACE_IR is a READ/CLEAR port! */ /* WARNING: MACE_IR is a READ/CLEAR port! */
status = inb(ioaddr + AM2150_MACE_BASE + MACE_IR); status = inb(ioaddr + AM2150_MACE_BASE + MACE_IR);
if (!(status & ~MACE_IMR_DEFAULT) && IntrCnt == MACE_MAX_IR_ITERATIONS)
return IRQ_NONE;
pr_debug("mace_interrupt: irq 0x%X status 0x%X.\n", irq, status); pr_debug("mace_interrupt: irq 0x%X status 0x%X.\n", irq, status);

3
drivers/net/ethernet/cirrus/Kconfig
View File

@ -32,7 +32,8 @@ config CS89x0
will be called cs89x0. will be called cs89x0.
config CS89x0_PLATFORM config CS89x0_PLATFORM
bool "CS89x0 platform driver support" bool "CS89x0 platform driver support" if HAS_IOPORT_MAP
default !HAS_IOPORT_MAP
depends on CS89x0 depends on CS89x0
help help
Say Y to compile the cs89x0 driver as a platform driver. This Say Y to compile the cs89x0 driver as a platform driver. This

6
drivers/net/wan/Kconfig
View File

@ -25,7 +25,7 @@ if WAN
# There is no way to detect a comtrol sv11 - force it modular for now. # There is no way to detect a comtrol sv11 - force it modular for now.
config HOSTESS_SV11 config HOSTESS_SV11
tristate "Comtrol Hostess SV-11 support" tristate "Comtrol Hostess SV-11 support"
depends on ISA && m && ISA_DMA_API && INET && HDLC depends on ISA && m && ISA_DMA_API && INET && HDLC && VIRT_TO_BUS
help help
Driver for Comtrol Hostess SV-11 network card which Driver for Comtrol Hostess SV-11 network card which
operates on low speed synchronous serial links at up to operates on low speed synchronous serial links at up to
@ -37,7 +37,7 @@ config HOSTESS_SV11
# The COSA/SRP driver has not been tested as non-modular yet. # The COSA/SRP driver has not been tested as non-modular yet.
config COSA config COSA
tristate "COSA/SRP sync serial boards support" tristate "COSA/SRP sync serial boards support"
depends on ISA && m && ISA_DMA_API && HDLC depends on ISA && m && ISA_DMA_API && HDLC && VIRT_TO_BUS
---help--- ---help---
Driver for COSA and SRP synchronous serial boards. Driver for COSA and SRP synchronous serial boards.
@ -87,7 +87,7 @@ config LANMEDIA
# There is no way to detect a Sealevel board. Force it modular # There is no way to detect a Sealevel board. Force it modular
config SEALEVEL_4021 config SEALEVEL_4021
tristate "Sealevel Systems 4021 support" tristate "Sealevel Systems 4021 support"
depends on ISA && m && ISA_DMA_API && INET && HDLC depends on ISA && m && ISA_DMA_API && INET && HDLC && VIRT_TO_BUS
help help
This is a driver for the Sealevel Systems ACB 56 serial I/O adapter. This is a driver for the Sealevel Systems ACB 56 serial I/O adapter.