aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-06 16:21:57 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-06 16:21:57 -0400
commit15700770ef7c5d12e2f1659d2ddbeb3f658d9f37 (patch)
tree7fa2f81c33c9efcb1a1568385beead75c5892cfb /drivers/scsi/Kconfig
parent6de410c2b0cc055ae9ee640c84331f6a70878d9b (diff)
parent11de39e2fbbc592018e0a231d0ee773653dcc8d6 (diff)
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 ...
Diffstat (limited to 'drivers/scsi/Kconfig')
-rw-r--r--drivers/scsi/Kconfig4
1 files changed, 2 insertions, 2 deletions
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
170 170
171 If you want to compile this as a module ( = code which can be 171 If you want to compile this as a module ( = code which can be
172 inserted in and removed from the running kernel whenever you want), 172 inserted in and removed from the running kernel whenever you want),
173 say M here and read <file:Documentation/modules.txt> and 173 say M here and read <file:Documentation/kbuild/modules.txt> and
174 <file:Documentation/scsi.txt>. The module will be called ch.o. 174 <file:Documentation/scsi.txt>. The module will be called ch.o.
175 If unsure, say N. 175 If unsure, say N.
176 176
@@ -1783,7 +1783,7 @@ config ZFCP
1783 1783
1784 This driver is also available as a module. This module will be 1784 This driver is also available as a module. This module will be
1785 called zfcp. If you want to compile it as a module, say M here 1785 called zfcp. If you want to compile it as a module, say M here
1786 and read <file:Documentation/modules.txt>. 1786 and read <file:Documentation/kbuild/modules.txt>.
1787 1787
1788config SCSI_SRP 1788config SCSI_SRP
1789 tristate "SCSI RDMA Protocol helper library" 1789 tristate "SCSI RDMA Protocol helper library"