diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-01 13:29:55 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-01 13:29:55 -0500 |
| commit | 0dbd888936a23514716b8d944775bc56f731363a (patch) | |
| tree | a2c60cdc45bdcbed47680731fa8188bffe58c098 /drivers/scsi/scsi_debug.c | |
| parent | 0b442d2c28479332610c46e1a74e5638ab63a97d (diff) | |
| parent | d395991c117d43bfca97101a931a41d062a93852 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/scsi/scsi_debug.c')
| -rw-r--r-- | drivers/scsi/scsi_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 1541c174937a..d1777a9a9625 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c | |||
| @@ -222,7 +222,7 @@ static struct scsi_host_template sdebug_driver_template = { | |||
| 222 | .cmd_per_lun = 16, | 222 | .cmd_per_lun = 16, |
| 223 | .max_sectors = 0xffff, | 223 | .max_sectors = 0xffff, |
| 224 | .unchecked_isa_dma = 0, | 224 | .unchecked_isa_dma = 0, |
| 225 | .use_clustering = ENABLE_CLUSTERING, | 225 | .use_clustering = DISABLE_CLUSTERING, |
| 226 | .module = THIS_MODULE, | 226 | .module = THIS_MODULE, |
| 227 | }; | 227 | }; |
| 228 | 228 | ||