Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (38 commits)
  kconfig: fix mconf segmentation fault
  kbuild: enable use of code from a different dir
  kconfig: error out if recursive dependencies are found
  kbuild: scripts/basic/fixdep segfault on pathological string-o-death
  kconfig: correct minor typo in Kconfig warning message.
  kconfig: fix path to modules.txt in Kconfig help
  usr/Kconfig: fix typo
  kernel-doc: alphabetically-sorted entries in index.html of 'htmldocs'
  kbuild: be more explicit on missing .config file
  kbuild: clarify the creation of the LOCALVERSION_AUTO string.
  kbuild: propagate errors from find in scripts/gen_initramfs_list.sh
  kconfig: refer to qt3 if we cannot find qt libraries
  kbuild: handle compressed cpio initramfs-es
  kbuild: ignore section mismatch warning for references from .paravirtprobe to .init.text
  kbuild: remove stale comment in modpost.c
  kbuild/mkuboot.sh: allow spaces in CROSS_COMPILE
  kbuild: fix make mrproper for Documentation/DocBook/man
  kbuild: remove kconfig binaries during make mrproper
  kconfig/menuconfig: do not hardcode '.config'
  kbuild: override build timestamp & version
  ...

5 files changed, 17 insertions, 17 deletions

diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig
index 690c94236d7f..ff642f8fbee7 100644
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
@@ -49,8 +49,8 @@ config MTD_MS02NV
 
           If you want to compile this driver 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/modules.txt>.  The module will
-          be called ms02-nv.o.
+          say M here and read <file:Documentation/kbuild/modules.txt>.
+          The module will be called ms02-nv.ko.
 
 config MTD_DATAFLASH
         tristate "Support for AT45xxx DataFlash"
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 69dba62e0bad..9e6933a5088e 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -833,8 +833,8 @@ config SMC91X
           This driver is also available as a module ( = code which can be
           inserted in and removed from the running kernel whenever you want).
           The module will be called smc91x.  If you want to compile it as a
-          module, say M here and read <file:Documentation/modules.txt> as well
-          as <file:Documentation/networking/net-modules.txt>.
+          module, say M here and read <file:Documentation/kbuild/modules.txt>
+          as well as <file:Documentation/networking/net-modules.txt>.
 
 config SMC9194
         tristate "SMC 9194 support"
@@ -889,7 +889,7 @@ config SMC911X
 
           This driver is also available as a module. The module will be 
           called smc911x.  If you want to compile it as a module, say M 
-          here and read <file:Documentation/modules.txt>
+          here and read <file:Documentation/kbuild/modules.txt>
 
 config NET_VENDOR_RACAL
         bool "Racal-Interlan (Micom) NI cards"
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index c4b3dc291a5a..0184614517f9 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -153,8 +153,8 @@ config IPW2100
  
           If you want to compile the driver 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/modules.txt>.  The module
-          will be called ipw2100.ko.
+          say M here and read <file:Documentation/kbuild/modules.txt>.
+          The module will be called ipw2100.ko.
         
 config IPW2100_MONITOR
         bool "Enable promiscuous mode"
@@ -208,8 +208,8 @@ config IPW2200
  
           If you want to compile the driver 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/modules.txt>.  The module
-          will be called ipw2200.ko.
+          say M here and read <file:Documentation/kbuild/modules.txt>.
+          The module will be called ipw2200.ko.
 
 config IPW2200_MONITOR
         bool "Enable promiscuous mode"
@@ -517,8 +517,8 @@ config PRISM54
           
           If you want to compile the driver 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/modules.txt>.  The module
-          will be called prism54.ko.
+          say M here and read <file:Documentation/kbuild/modules.txt>.
+          The module will be called prism54.ko.
 
 config USB_ZD1201
         tristate "USB ZD1201 based Wireless device support"
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 58c811d20eb2..e62d23f65180 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -170,7 +170,7 @@ config CHR_DEV_SCH
         
           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/modules.txt> and
+          say M here and read <file:Documentation/kbuild/modules.txt> and
           <file:Documentation/scsi.txt>. The module will be called ch.o.
           If unsure, say N.
         
@@ -1783,7 +1783,7 @@ config ZFCP
 
           This driver is also available as a module. This module will be
           called zfcp. If you want to compile it as a module, say M here
-          and read <file:Documentation/modules.txt>.
+          and read <file:Documentation/kbuild/modules.txt>.
 
 config SCSI_SRP
         tristate "SCSI RDMA Protocol helper library"
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index d18b51f989c9..2d89d0e9bcf4 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -191,7 +191,7 @@ config FB_ARMCLCD
 
           If you want to compile this as a module (=code which can be
           inserted into and removed from the running kernel), say M
-          here and read <file:Documentation/modules.txt>.  The module
+          here and read <file:Documentation/kbuild/modules.txt>.  The module
           will be called amba-clcd.
 
 choice
@@ -1494,7 +1494,7 @@ config FB_PXA
           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 pxafb. 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.
 
@@ -1547,7 +1547,7 @@ config FB_W100
           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 w100fb. 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.
 
@@ -1564,7 +1564,7 @@ config FB_S3C2410
           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 s3c2410fb. 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.
 config FB_S3C2410_DEBUG