aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mtd/Kconfig4
-rw-r--r--drivers/mtd/maps/Kconfig2
-rw-r--r--drivers/scsi/Kconfig10
-rw-r--r--sound/oss/Kconfig2
4 files changed, 9 insertions, 9 deletions
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index f6b775e63ac8..0fe0b61ef00a 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 7abd7fee0dda..97b3e0d20865 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 a480a3742d47..3e254560df4b 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1159,7 +1159,7 @@ config SCSI_NCR_Q720
1159 you do not have this SCSI card, so say N. 1159 you do not have this SCSI card, so say N.
1160 1160
1161config SCSI_NCR53C8XX_DEFAULT_TAGS 1161config SCSI_NCR53C8XX_DEFAULT_TAGS
1162 int " default tagged command queue depth" 1162 int "default tagged command queue depth"
1163 depends on SCSI_ZALON || SCSI_NCR_Q720 1163 depends on SCSI_ZALON || SCSI_NCR_Q720
1164 default "8" 1164 default "8"
1165 ---help--- 1165 ---help---
@@ -1185,7 +1185,7 @@ config SCSI_NCR53C8XX_DEFAULT_TAGS
1185 There is no safe option other than using good SCSI devices. 1185 There is no safe option other than using good SCSI devices.
1186 1186
1187config SCSI_NCR53C8XX_MAX_TAGS 1187config SCSI_NCR53C8XX_MAX_TAGS
1188 int " maximum number of queued commands" 1188 int "maximum number of queued commands"
1189 depends on SCSI_ZALON || SCSI_NCR_Q720 1189 depends on SCSI_ZALON || SCSI_NCR_Q720
1190 default "32" 1190 default "32"
1191 ---help--- 1191 ---help---
@@ -1202,7 +1202,7 @@ config SCSI_NCR53C8XX_MAX_TAGS
1202 There is no safe option and the default answer is recommended. 1202 There is no safe option and the default answer is recommended.
1203 1203
1204config SCSI_NCR53C8XX_SYNC 1204config SCSI_NCR53C8XX_SYNC
1205 int " synchronous transfers frequency in MHz" 1205 int "synchronous transfers frequency in MHz"
1206 depends on SCSI_ZALON || SCSI_NCR_Q720 1206 depends on SCSI_ZALON || SCSI_NCR_Q720
1207 default "20" 1207 default "20"
1208 ---help--- 1208 ---help---
@@ -1236,7 +1236,7 @@ config SCSI_NCR53C8XX_SYNC
1236 terminations and SCSI conformant devices. 1236 terminations and SCSI conformant devices.
1237 1237
1238config SCSI_NCR53C8XX_PROFILE 1238config SCSI_NCR53C8XX_PROFILE
1239 bool " enable profiling" 1239 bool "enable profiling"
1240 depends on SCSI_ZALON || SCSI_NCR_Q720 1240 depends on SCSI_ZALON || SCSI_NCR_Q720
1241 help 1241 help
1242 This option allows you to enable profiling information gathering. 1242 This option allows you to enable profiling information gathering.
@@ -1247,7 +1247,7 @@ config SCSI_NCR53C8XX_PROFILE
1247 The normal answer therefore is N. 1247 The normal answer therefore is N.
1248 1248
1249config SCSI_NCR53C8XX_NO_DISCONNECT 1249config SCSI_NCR53C8XX_NO_DISCONNECT
1250 bool " not allow targets to disconnect" 1250 bool "not allow targets to disconnect"
1251 depends on (SCSI_ZALON || SCSI_NCR_Q720) && SCSI_NCR53C8XX_DEFAULT_TAGS=0 1251 depends on (SCSI_ZALON || SCSI_NCR_Q720) && SCSI_NCR53C8XX_DEFAULT_TAGS=0
1252 help 1252 help
1253 This option is only provided for safety if you suspect some SCSI 1253 This option is only provided for safety if you suspect some SCSI
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 558c6ed443be..e5bce16b0c4c 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -838,6 +838,6 @@ config SOUND_SH_DAC_AUDIO
838 depends on SOUND_PRIME && CPU_SH3 838 depends on SOUND_PRIME && CPU_SH3
839 839
840config SOUND_SH_DAC_AUDIO_CHANNEL 840config SOUND_SH_DAC_AUDIO_CHANNEL
841 int " DAC channel" 841 int "DAC channel"
842 default "1" 842 default "1"
843 depends on SOUND_SH_DAC_AUDIO 843 depends on SOUND_SH_DAC_AUDIO