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

[linux-2.6] / drivers / w1 / Kconfig

diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index f2d9a08e89ae277b4d95cd42e4e44c88310753cc..c287a9ae4fdd56690444c44a2f6e57269e50cb5a 100644 (file)
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -20,7 +20,7 @@ config W1_CON
          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.
-         2. Userspace commands. Includes read/write and search/alarm search comamnds.
+         2. Userspace commands. Includes read/write and search/alarm search commands.
          3. Replies to userspace commands.
 
 source drivers/w1/masters/Kconfig