summaryrefslogtreecommitdiffstats
path: root/drivers/net/wan/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-16 11:19:53 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-16 11:19:53 +0200
commit064a32d82c20cdcb0119a8b316eb520608d8c647 (patch)
treec67d534bd4458b1482c11f11c724fe93beca4f80 /drivers/net/wan/Kconfig
parent0327318445d55808991a63137cfb698a90ab6adf (diff)
parent066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff)
downloadblackbird-op-linux-064a32d82c20cdcb0119a8b316eb520608d8c647.tar.gz
blackbird-op-linux-064a32d82c20cdcb0119a8b316eb520608d8c647.zip
Merge branch 'linus' into x86/memtest
Diffstat (limited to 'drivers/net/wan/Kconfig')
-rw-r--r--drivers/net/wan/Kconfig4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index 8005dd16fb4e..d5140aed7b79 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -150,11 +150,9 @@ config HDLC_FR
config HDLC_PPP
tristate "Synchronous Point-to-Point Protocol (PPP) support"
- depends on HDLC && BROKEN
+ depends on HDLC
help
Generic HDLC driver supporting PPP over WAN connections.
- This module is currently broken and will cause a kernel panic
- when a device configured in PPP mode is activated.
It will be replaced by new PPP implementation in Linux 2.6.26.
OpenPOWER on IntegriCloud