Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux-block.git] / drivers / w1 / Kconfig

diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index 6854fd6b9714a2a03752f70becce39d4780f6147..fd2c7bd9dfbeea439c142ec1477b7e2ff2811f2b 100644 (file)
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -8,7 +8,7 @@ menuconfig W1
          If you want W1 support, you should say Y here.
 
          This W1 support can also be built as a module.  If so, the module
-         will be called wire.ko.
+         will be called wire.
 
 if W1
 
@@ -17,7 +17,8 @@ config W1_CON
        bool "Userspace communication over connector"
        default y
        --- help ---
-         This allows to communicate with userspace using connector [Documentation/connector].
+         This allows to communicate with userspace using connector. For more
+         information see <file:Documentation/connector/connector.txt>.
          There are three types of messages between w1 core and userspace:
          1. Events. They are generated each time new master or slave device found
                either due to automatic or requested search.