Merge branch 'linus' into x86/urgent

[linux-2.6-omap-h63xx.git] / drivers / net / wan / Kconfig

diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index 4fc8681bc110696305b6acc63da9ec6afdcc5e58..d5140aed7b7977cc16475a0100cfb9c1414aea26 100644 (file)
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -61,7 +61,7 @@ config COSA
 #
 config LANMEDIA
        tristate "LanMedia Corp. SSI/V.35, T1/E1, HSSI, T3 boards"
-       depends on PCI
+       depends on PCI && VIRT_TO_BUS
        ---help---
          Driver for the following Lan Media family of serial boards:
 
@@ -154,6 +154,8 @@ config HDLC_PPP
        help
          Generic HDLC driver supporting PPP over WAN connections.
 
+         It will be replaced by new PPP implementation in Linux 2.6.26.
+
          If unsure, say N.
 
 config HDLC_X25