Patch "net: via/Kconfig: GENERIC_PCI_IOMAP required if PCI not selected" has been added to the 4.2-stable tree

Patch "net: via/Kconfig: GENERIC_PCI_IOMAP required if PCI not selected" has been added to the 4.2-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    net: via/Kconfig: GENERIC_PCI_IOMAP required if PCI not selected

to the 4.2-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     net-via-kconfig-generic_pci_iomap-required-if-pci-not-selected.patch
and it can be found in the queue-4.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 21343ac21ec7d871e94e98e288f3398a4207d9c0 Mon Sep 17 00:00:00 2001
From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Date: Thu, 24 Sep 2015 15:46:53 +0530
Subject: net: via/Kconfig: GENERIC_PCI_IOMAP required if PCI not selected

From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>

commit 21343ac21ec7d871e94e98e288f3398a4207d9c0 upstream.

The builds of allmodconfig of avr32 is failing with:

drivers/net/ethernet/via/via-rhine.c:1098:2: error: implicit declaration
of function 'pci_iomap' [-Werror=implicit-function-declaration]
drivers/net/ethernet/via/via-rhine.c:1119:2: error: implicit declaration
of function 'pci_iounmap' [-Werror=implicit-function-declaration]

The generic empty pci_iomap and pci_iounmap is used only if CONFIG_PCI
is not defined and CONFIG_GENERIC_PCI_IOMAP is defined.

Add GENERIC_PCI_IOMAP in the dependency list for VIA_RHINE as we are
getting build failure when CONFIG_PCI and CONFIG_GENERIC_PCI_IOMAP both
are not defined.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/net/ethernet/via/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/net/ethernet/via/Kconfig
+++ b/drivers/net/ethernet/via/Kconfig
@@ -17,7 +17,7 @@ if NET_VENDOR_VIA
 
 config VIA_RHINE
 	tristate "VIA Rhine support"
-	depends on (PCI || OF_IRQ)
+	depends on PCI || (OF_IRQ && GENERIC_PCI_IOMAP)
 	depends on HAS_DMA
 	select CRC32
 	select MII


Patches currently in stable-queue which might be from sudipm.mukherjee@gmail.com are

queue-4.2/net-via-kconfig-generic_pci_iomap-required-if-pci-not-selected.patch
queue-4.2/spi-spidev-fix-possible-null-dereference.patch