diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:33:05 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:33:05 -0400 |
| commit | c97f68145e8067b3ac4b126a6faebf90f9ffc302 (patch) | |
| tree | eb2060681552a00e9efa98224b95f69a3dc84390 /drivers/scsi/Kconfig | |
| parent | b1add0480a95b6ceaece5caf6c50614771eae9b2 (diff) | |
| parent | 7bff3c4ce44ea48f50dc47a5994454984bd08c59 (diff) | |
Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git
Merge branch 'davinci' into devel
Diffstat (limited to 'drivers/scsi/Kconfig')
| -rw-r--r-- | drivers/scsi/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index c7f06298bd3c..4e0322b1c1ea 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
| @@ -63,7 +63,7 @@ comment "SCSI support type (disk, tape, CD-ROM)" | |||
| 63 | config BLK_DEV_SD | 63 | config BLK_DEV_SD |
| 64 | tristate "SCSI disk support" | 64 | tristate "SCSI disk support" |
| 65 | depends on SCSI | 65 | depends on SCSI |
| 66 | select CRC_T10DIF | 66 | select CRC_T10DIF if BLK_DEV_INTEGRITY |
| 67 | ---help--- | 67 | ---help--- |
| 68 | If you want to use SCSI hard disks, Fibre Channel disks, | 68 | If you want to use SCSI hard disks, Fibre Channel disks, |
| 69 | Serial ATA (SATA) or Parallel ATA (PATA) hard disks, | 69 | Serial ATA (SATA) or Parallel ATA (PATA) hard disks, |