Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux

[karo-tx-linux.git] / net / phonet / Kconfig

diff --git a/net/phonet/Kconfig b/net/phonet/Kconfig
index 0d9b8a220a7871a5bed180567a50036a1520d920..6ec7d55b1769933f399af5f4673b95c2de83150c 100644 (file)
--- a/net/phonet/Kconfig
+++ b/net/phonet/Kconfig
@@ -14,15 +14,3 @@ config PHONET
 
          To compile this driver as a module, choose M here: the module
          will be called phonet. If unsure, say N.
-
-config PHONET_PIPECTRLR
-       bool "Phonet Pipe Controller (EXPERIMENTAL)"
-       depends on PHONET && EXPERIMENTAL
-       default N
-       help
-         The Pipe Controller implementation in Phonet stack to support Pipe
-         data with Nokia Slim modems like WG2.5 used on ST-Ericsson U8500
-         platform.
-
-         This option is incompatible with older Nokia modems.
-         Say N here unless you really know what you are doing.