git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/topic/inntel', 'asoc/topic/input', 'asoc/topic...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ethernet
/
stmicro
/
stmmac
/
Kconfig
diff --git
a/drivers/net/ethernet/stmicro/stmmac/Kconfig
b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index 3818c5e06ebac5099f8051c813222349a2f6a6a5..4b78168a5f3ce8cd8b971c3e88c5addf1f46a7e3 100644
(file)
--- a/
drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/
drivers/net/ethernet/stmicro/stmmac/Kconfig
@@
-107,7
+107,7
@@
config DWMAC_STI
config DWMAC_STM32
tristate "STM32 DWMAC support"
default ARCH_STM32
- depends on OF && HAS_IOMEM
+ depends on OF && HAS_IOMEM
&& (ARCH_STM32 || COMPILE_TEST)
select MFD_SYSCON
---help---
Support for ethernet controller on STM32 SOCs.