The builds of arch/sh are failing in linux-next 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]
cc1: some warnings being treated as errors
make[5]: *** [drivers/net/ethernet/via/via-rhine.o] Error 1
The logic in include/asm-generic/{io,iomap,pci_iomap}.h
requires GENERIC_PCI_IOMAP to inline empty pci_iomap/pci_iounmap
when PCI is not selected.
Add GENERIC_PCI_IOMAP in the dependency list for VIA_RHINE and
VIA_VELOCITY.
Reported-by: Paul Gortmaker <paul.gortma...@windriver.com>
Signed-off-by: Antonio Borneo <borneo.anto...@gmail.com>
---
drivers/net/ethernet/via/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/via/Kconfig b/drivers/net/ethernet/via/Kconfig
index 9bf3ff1..96c527c 100644
--- a/drivers/net/ethernet/via/Kconfig
+++ b/drivers/net/ethernet/via/Kconfig
@@ -19,7 +19,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
@@ -44,7 +44,7 @@ config VIA_RHINE_MMIO
config VIA_VELOCITY
tristate "VIA Velocity support"
- depends on (PCI || (OF_ADDRESS && OF_IRQ))
+ depends on (PCI || (OF_ADDRESS && OF_IRQ && GENERIC_PCI_IOMAP))
depends on HAS_DMA
select CRC32
select CRC_CCITT
--
2.4.6
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
