5 files changed, 12 insertions, 11 deletions

diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index 25cfc6c32509..8d52a26c248a 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -96,8 +96,8 @@ config IWL4965
 
           If you want to compile the driver as a module ( = code which can be
           inserted in and remvoed from the running kernel whenever you want),
-          say M here and read <file:Documentation/modules.txt>.  The module
-          will be called iwl4965.ko.
+          say M here and read <file:Documentation/kbuild/modules.txt>.  The
+          module will be called iwl4965.ko.
 
 config IWL3945
         tristate "Intel PRO/Wireless 3945ABG/BG Network Connection"
@@ -124,5 +124,5 @@ config IWL3945
 
           If you want to compile the driver as a module ( = code which can be
           inserted in and remvoed from the running kernel whenever you want),
-          say M here and read <file:Documentation/modules.txt>.  The module
-          will be called iwl3945.ko.
+          say M here and read <file:Documentation/kbuild/modules.txt>.  The
+          module will be called iwl3945.ko.
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index a5763c6e9362..86cf10efb0c1 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -172,12 +172,12 @@ config CHR_DEV_SCH
           don't need this for those tiny 6-slot cdrom changers.  Media
           changers are listed as "Type: Medium Changer" in /proc/scsi/scsi.
           If you have such hardware and want to use it with linux, say Y
-          here.  Check <file:Documentation/scsi-changer.txt> for details.
+          here.  Check <file:Documentation/scsi/scsi-changer.txt> for details.
         
           If you want to compile this as a module ( = code which can be
           inserted in and removed from the running kernel whenever you want),
           say M here and read <file:Documentation/kbuild/modules.txt> and
-          <file:Documentation/scsi.txt>. The module will be called ch.o.
+          <file:Documentation/scsi/scsi.txt>. The module will be called ch.o.
           If unsure, say N.
         
 
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 61717fa1afb9..cc4b60f899ca 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1509,7 +1509,7 @@ config FB_VOODOO1
 
           WARNING: Do not use any application that uses the 3D engine
           (namely glide) while using this driver.
-          Please read the <file:Documentation/fb/README-sstfb.txt> for supported
+          Please read the <file:Documentation/fb/sstfb.txt> for supported
           options and other important info  support.
 
 config FB_VT8623
@@ -1807,7 +1807,7 @@ config FB_SM501
           This driver is also available as a module ( = code which can be
           inserted and removed from the running kernel whenever you want). The
           module will be called sm501fb. If you want to compile it as a module,
-          say M here and read <file:Documentation/modules.txt>.
+          say M here and read <file:Documentation/kbuild/modules.txt>.
 
           If unsure, say N.
 
diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index 6854fd6b9714..9adbb4f90479 100644
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -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.
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 81db48f07ca1..2792bc1a7269 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -15,8 +15,8 @@ menuconfig WATCHDOG
           implementation entirely in software (which can sometimes fail to
           reboot the machine) and a driver for hardware watchdog boards, which
           are more robust and can also keep track of the temperature inside
-          your computer. For details, read <file:Documentation/watchdog/watchdog.txt>
-          in the kernel source.
+          your computer. For details, read
+          <file:Documentation/watchdog/watchdog-api.txt> in the kernel source.
 
           The watchdog is usually used together with the watchdog daemon
           which is available from