aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2010-10-01 11:17:13 +0000
committerDavid S. Miller <davem@davemloft.net>2010-10-06 23:42:43 -0700
commit9deec17f9fe260f1b6467748fe5e16feea8e98f0 (patch)
tree1590bc39644805e3b1e8f59d2763255637e04474
parent3d3211ef5cf7558d289d1a1efbef8c45595639aa (diff)
downloadkernel_samsung_smdk4412-9deec17f9fe260f1b6467748fe5e16feea8e98f0.zip
kernel_samsung_smdk4412-9deec17f9fe260f1b6467748fe5e16feea8e98f0.tar.gz
kernel_samsung_smdk4412-9deec17f9fe260f1b6467748fe5e16feea8e98f0.tar.bz2
drivers/net/stmmac/: add HAS_IOMEM dependency
The stmmac driver does not compile on s390: drivers/net/stmmac/stmmac_main.c: In function 'stmmac_adjust_link': drivers/net/stmmac/stmmac_main.c:210: error: implicit declaration of function 'readl' drivers/net/stmmac/stmmac_main.c:263: error: implicit declaration of function 'writel' drivers/net/stmmac/stmmac_main.c: In function 'stmmac_dvr_probe': drivers/net/stmmac/stmmac_main.c:1674: error: implicit declaration of function 'ioremap' drivers/net/stmmac/stmmac_main.c:1674: warning: assignment makes pointer from integer without a cast drivers/net/stmmac/stmmac_main.c:1761: error: implicit declaration of function 'iounmap' make[3]: *** [drivers/net/stmmac/stmmac_main.o] Error 1 Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Giuseppe CAVALLARO <peppe.cavallaro@st.com> Cc: David S. Miller <davem@davemloft.net> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/stmmac/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/stmmac/Kconfig b/drivers/net/stmmac/Kconfig
index 3c2af7c..7df7df4 100644
--- a/drivers/net/stmmac/Kconfig
+++ b/drivers/net/stmmac/Kconfig
@@ -3,7 +3,7 @@ config STMMAC_ETH
select MII
select PHYLIB
select CRC32
- depends on NETDEVICES
+ depends on NETDEVICES && HAS_IOMEM
help
This is the driver for the Ethernet IPs are built around a
Synopsys IP Core and only tested on the STMicroelectronics