aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/phy/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@evo.osdl.org>2005-09-06 00:47:18 -0700
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-06 00:47:18 -0700
commit5bcaa155797ab62ed363932ec0f02fbcb5db1ef1 (patch)
tree1db633712bd47ce72ac5a1aed62b3417733ac63a /drivers/net/phy/Kconfig
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parent[PATCH] orinoco: New driver - spectrum_cs. (diff)
downloadlinux-dev-5bcaa155797ab62ed363932ec0f02fbcb5db1ef1.tar.xz
linux-dev-5bcaa155797ab62ed363932ec0f02fbcb5db1ef1.zip
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/phy/Kconfig')
-rw-r--r--drivers/net/phy/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 6a2fe3583478..14f4de1a8180 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -6,7 +6,7 @@ menu "PHY device support"
config PHYLIB
tristate "PHY Device support and infrastructure"
- depends on NET_ETHERNET
+ depends on NET_ETHERNET && (BROKEN || !ARCH_S390)
help
Ethernet controllers are usually attached to PHY
devices. This option provides infrastructure for