projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[cascardo/linux.git]
/
drivers
/
net
/
phy
/
Kconfig
diff --git
a/drivers/net/phy/Kconfig
b/drivers/net/phy/Kconfig
index
3a316b3
..
342561a
100644
(file)
--- a/
drivers/net/phy/Kconfig
+++ b/
drivers/net/phy/Kconfig
@@
-135,7
+135,7
@@
config MDIO_GPIO
config MDIO_OCTEON
tristate "Support for MDIO buses on Octeon SOCs"
- depends on
CPU_CAVIUM_OCTEON
+ depends on
CAVIUM_OCTEON_SOC
default y
help