Commit a1a0b558 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents e2a4800e 96a30175

drivers/net/ethernet/amd/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ config AMD8111_ETH 


config LANCE

	tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"

	depends on ISA && ISA_DMA_API

	depends on ISA && ISA_DMA_API && !ARM

	---help---

	  If you have a network (Ethernet) card of this type, say Y and read

	  the Ethernet-HOWTO, available from
@@ -142,7 +142,7 @@ config PCMCIA_NMCLAN 


config NI65

	tristate "NI6510 support"

	depends on ISA && ISA_DMA_API

	depends on ISA && ISA_DMA_API && !ARM

	---help---

	  If you have a network (Ethernet) card of this type, say Y and read

	  the Ethernet-HOWTO, available from

drivers/net/ethernet/amd/nmclan_cs.c

+2 −0
Original line number Diff line number Diff line
@@ -952,6 +952,8 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id) 
  do {

    /* WARNING: MACE_IR is a READ/CLEAR port! */

    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);

drivers/net/ethernet/cirrus/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ config CS89x0 
	  will be called cs89x0.



config CS89x0_PLATFORM

	bool "CS89x0 platform driver support"

	bool "CS89x0 platform driver support" if HAS_IOPORT_MAP

	default !HAS_IOPORT_MAP

	depends on CS89x0

	help

	  Say Y to compile the cs89x0 driver as a platform driver. This

drivers/net/wan/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ if WAN 
# There is no way to detect a comtrol sv11 - force it modular for now.

config HOSTESS_SV11

	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

	  Driver for Comtrol Hostess SV-11 network card which

	  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.

config COSA

	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---

	  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

config SEALEVEL_4021

	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

	  This is a driver for the Sealevel Systems ACB 56 serial I/O adapter.

CRA Git | Maintained and supported by SUSTech CRA and CCSE