diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-05 16:30:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-05 16:30:44 -0400 |
commit | 4f7a307dc6e4d8bfeb56f7cf7231b08cb845687c (patch) | |
tree | 3bf90522c87fcb32373cb2a5ff25b1ead33405f5 /drivers/scsi/Kconfig | |
parent | fabb5c4e4a474ff0f7d6c1d3466a1b79bbce5f49 (diff) | |
parent | 7297824581755593535fc97d2c8b6c47e2dc2db6 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (87 commits)
[SCSI] fusion: fix domain validation loops
[SCSI] qla2xxx: fix regression on sparc64
[SCSI] modalias for scsi devices
[SCSI] sg: cap reserved_size values at max_sectors
[SCSI] BusLogic: stop using check_region
[SCSI] tgt: fix rdma transfer bugs
[SCSI] aacraid: fix aacraid not finding device
[SCSI] aacraid: Correct SMC products in aacraid.txt
[SCSI] scsi_error.c: Add EH Start Unit retry
[SCSI] aacraid: [Fastboot] Panics for AACRAID driver during 'insmod' for kexec test.
[SCSI] ipr: Driver version to 2.3.2
[SCSI] ipr: Faster sg list fetch
[SCSI] ipr: Return better qc_issue errors
[SCSI] ipr: Disrupt device error
[SCSI] ipr: Improve async error logging level control
[SCSI] ipr: PCI unblock config access fix
[SCSI] ipr: Fix for oops following SATA request sense
[SCSI] ipr: Log error for SAS dual path switch
[SCSI] ipr: Enable logging of debug error data for all devices
[SCSI] ipr: Add new PCI-E IDs to device table
...
Diffstat (limited to 'drivers/scsi/Kconfig')
-rw-r--r-- | drivers/scsi/Kconfig | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index e1ebed0f0755..58c811d20eb2 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
@@ -241,6 +241,12 @@ config SCSI_SCAN_ASYNC | |||
241 | You can override this choice by specifying "scsi_mod.scan=sync" | 241 | You can override this choice by specifying "scsi_mod.scan=sync" |
242 | or async on the kernel's command line. | 242 | or async on the kernel's command line. |
243 | 243 | ||
244 | config SCSI_WAIT_SCAN | ||
245 | tristate | ||
246 | default m | ||
247 | depends on SCSI | ||
248 | depends on MODULES | ||
249 | |||
244 | menu "SCSI Transports" | 250 | menu "SCSI Transports" |
245 | depends on SCSI | 251 | depends on SCSI |
246 | 252 | ||
@@ -1194,17 +1200,6 @@ config SCSI_NCR53C8XX_SYNC | |||
1194 | There is no safe option other than using good cabling, right | 1200 | There is no safe option other than using good cabling, right |
1195 | terminations and SCSI conformant devices. | 1201 | terminations and SCSI conformant devices. |
1196 | 1202 | ||
1197 | config SCSI_NCR53C8XX_PROFILE | ||
1198 | bool "enable profiling" | ||
1199 | depends on SCSI_ZALON || SCSI_NCR_Q720 | ||
1200 | help | ||
1201 | This option allows you to enable profiling information gathering. | ||
1202 | These statistics are not very accurate due to the low frequency | ||
1203 | of the kernel clock (100 Hz on i386) and have performance impact | ||
1204 | on systems that use very fast devices. | ||
1205 | |||
1206 | The normal answer therefore is N. | ||
1207 | |||
1208 | config SCSI_NCR53C8XX_NO_DISCONNECT | 1203 | config SCSI_NCR53C8XX_NO_DISCONNECT |
1209 | bool "not allow targets to disconnect" | 1204 | bool "not allow targets to disconnect" |
1210 | depends on (SCSI_ZALON || SCSI_NCR_Q720) && SCSI_NCR53C8XX_DEFAULT_TAGS=0 | 1205 | depends on (SCSI_ZALON || SCSI_NCR_Q720) && SCSI_NCR53C8XX_DEFAULT_TAGS=0 |
@@ -1334,11 +1329,6 @@ config SCSI_SIM710 | |||
1334 | 1329 | ||
1335 | It currently supports Compaq EISA cards and NCR MCA cards | 1330 | It currently supports Compaq EISA cards and NCR MCA cards |
1336 | 1331 | ||
1337 | config 53C700_IO_MAPPED | ||
1338 | bool | ||
1339 | depends on SCSI_SIM710 | ||
1340 | default y | ||
1341 | |||
1342 | config SCSI_SYM53C416 | 1332 | config SCSI_SYM53C416 |
1343 | tristate "Symbios 53c416 SCSI support" | 1333 | tristate "Symbios 53c416 SCSI support" |
1344 | depends on ISA && SCSI | 1334 | depends on ISA && SCSI |