aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 14:05:15 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 14:05:15 -0400
commit2a2ed2db353d949c06b6ef8b6913f65b39111eab (patch)
treed835c3dd101da91089c3bdf51c8632e84be37232 /drivers
parent972d19e837833b93466c6f6a8ef2a7d653000aa3 (diff)
parent070b98bfda3d27269519067c1c67eaef695f3e0c (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits) kbuild: trivial fixes in Makefile kbuild: adding symbols in Kconfig and defconfig to TAGS kbuild: replace abort() with exit(1) kbuild: support for %.symtypes files kbuild: fix silentoldconfig recursion kbuild: add option for stripping modules while installing them kbuild: kill some false positives from modpost kbuild: export-symbol usage report generator kbuild: fix make -rR breakage kbuild: append -dirty for updated but uncommited changes kbuild: append git revision for all untagged commits kbuild: fix module.symvers parsing in modpost kbuild: ignore make's built-in rules & variables kbuild: bugfix with initramfs kbuild: modpost build fix kbuild: check license compatibility when building modules kbuild: export-type enhancement to modpost.c kbuild: add dependency on kernel.release to the package targets kbuild: `make kernelrelease' speedup kconfig: KCONFIG_OVERWRITECONFIG ...
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/Kconfig4
-rw-r--r--drivers/mtd/maps/Kconfig2
-rw-r--r--drivers/scsi/Kconfig10
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 5ac265dde423..1344ad7a4b14 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -86,14 +86,14 @@ config MTD_REDBOOT_DIRECTORY_BLOCK
86 block and "-2" means the penultimate block. 86 block and "-2" means the penultimate block.
87 87
88config MTD_REDBOOT_PARTS_UNALLOCATED 88config MTD_REDBOOT_PARTS_UNALLOCATED
89 bool " Include unallocated flash regions" 89 bool "Include unallocated flash regions"
90 depends on MTD_REDBOOT_PARTS 90 depends on MTD_REDBOOT_PARTS
91 help 91 help
92 If you need to register each unallocated flash region as a MTD 92 If you need to register each unallocated flash region as a MTD
93 'partition', enable this option. 93 'partition', enable this option.
94 94
95config MTD_REDBOOT_PARTS_READONLY 95config MTD_REDBOOT_PARTS_READONLY
96 bool " Force read-only for RedBoot system images" 96 bool "Force read-only for RedBoot system images"
97 depends on MTD_REDBOOT_PARTS 97 depends on MTD_REDBOOT_PARTS
98 help 98 help
99 If you need to force read-only for 'RedBoot', 'RedBoot Config' and 99 If you need to force read-only for 'RedBoot', 'RedBoot Config' and
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 6bdaacc6d6f9..83d0b2a52527 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -212,7 +212,7 @@ config MTD_NETtel
212 Support for flash chips on NETtel/SecureEdge/SnapGear boards. 212 Support for flash chips on NETtel/SecureEdge/SnapGear boards.
213 213
214config MTD_ALCHEMY 214config MTD_ALCHEMY
215 tristate ' AMD Alchemy Pb1xxx/Db1xxx/RDK MTD support' 215 tristate "AMD Alchemy Pb1xxx/Db1xxx/RDK MTD support"
216 depends on SOC_AU1X00 216 depends on SOC_AU1X00
217 help 217 help
218 Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards 218 Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 44728ae3fe77..c84b02aec1f3 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1169,7 +1169,7 @@ config SCSI_NCR_Q720
1169 you do not have this SCSI card, so say N. 1169 you do not have this SCSI card, so say N.
1170 1170
1171config SCSI_NCR53C8XX_DEFAULT_TAGS 1171config SCSI_NCR53C8XX_DEFAULT_TAGS
1172 int " default tagged command queue depth" 1172 int "default tagged command queue depth"
1173 depends on SCSI_ZALON || SCSI_NCR_Q720 1173 depends on SCSI_ZALON || SCSI_NCR_Q720
1174 default "8" 1174 default "8"
1175 ---help--- 1175 ---help---
@@ -1195,7 +1195,7 @@ config SCSI_NCR53C8XX_DEFAULT_TAGS
1195 There is no safe option other than using good SCSI devices. 1195 There is no safe option other than using good SCSI devices.
1196 1196
1197config SCSI_NCR53C8XX_MAX_TAGS 1197config SCSI_NCR53C8XX_MAX_TAGS
1198 int " maximum number of queued commands" 1198 int "maximum number of queued commands"
1199 depends on SCSI_ZALON || SCSI_NCR_Q720 1199 depends on SCSI_ZALON || SCSI_NCR_Q720
1200 default "32" 1200 default "32"
1201 ---help--- 1201 ---help---
@@ -1212,7 +1212,7 @@ config SCSI_NCR53C8XX_MAX_TAGS
1212 There is no safe option and the default answer is recommended. 1212 There is no safe option and the default answer is recommended.
1213 1213
1214config SCSI_NCR53C8XX_SYNC 1214config SCSI_NCR53C8XX_SYNC
1215 int " synchronous transfers frequency in MHz" 1215 int "synchronous transfers frequency in MHz"
1216 depends on SCSI_ZALON || SCSI_NCR_Q720 1216 depends on SCSI_ZALON || SCSI_NCR_Q720
1217 default "20" 1217 default "20"
1218 ---help--- 1218 ---help---
@@ -1246,7 +1246,7 @@ config SCSI_NCR53C8XX_SYNC
1246 terminations and SCSI conformant devices. 1246 terminations and SCSI conformant devices.
1247 1247
1248config SCSI_NCR53C8XX_PROFILE 1248config SCSI_NCR53C8XX_PROFILE
1249 bool " enable profiling" 1249 bool "enable profiling"
1250 depends on SCSI_ZALON || SCSI_NCR_Q720 1250 depends on SCSI_ZALON || SCSI_NCR_Q720
1251 help 1251 help
1252 This option allows you to enable profiling information gathering. 1252 This option allows you to enable profiling information gathering.
@@ -1257,7 +1257,7 @@ config SCSI_NCR53C8XX_PROFILE
1257 The normal answer therefore is N. 1257 The normal answer therefore is N.
1258 1258
1259config SCSI_NCR53C8XX_NO_DISCONNECT 1259config SCSI_NCR53C8XX_NO_DISCONNECT
1260 bool " not allow targets to disconnect" 1260 bool "not allow targets to disconnect"
1261 depends on (SCSI_ZALON || SCSI_NCR_Q720) && SCSI_NCR53C8XX_DEFAULT_TAGS=0 1261 depends on (SCSI_ZALON || SCSI_NCR_Q720) && SCSI_NCR53C8XX_DEFAULT_TAGS=0
1262 help 1262 help
1263 This option is only provided for safety if you suspect some SCSI 1263 This option is only provided for safety if you suspect some SCSI