summaryrefslogtreecommitdiffstats
path: root/drivers/block/cciss_scsi.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-05-26 13:51:31 +0200
committerIngo Molnar <mingo@elte.hu>2011-05-26 13:51:35 +0200
commitde66ee979d0ea45171cc2501750e9f9f22f5a690 (patch)
tree5ab1a5c6b596b9b786902fb380274e1e1f4ceb13 /drivers/block/cciss_scsi.h
parentx86, efi: Retain boot service code until after switching to virtual mode (diff)
parenttmpfs: fix XATTR N overriding POSIX_ACL Y (diff)
downloadlinux-de66ee979d0ea45171cc2501750e9f9f22f5a690.tar.xz
linux-de66ee979d0ea45171cc2501750e9f9f22f5a690.zip
Merge branch 'linus' into x86/urgent
Merge reason: we want to queue up a dependent patch. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/block/cciss_scsi.h')
-rw-r--r--drivers/block/cciss_scsi.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/block/cciss_scsi.h b/drivers/block/cciss_scsi.h
index 6d5822fe851a..e71d986727ca 100644
--- a/drivers/block/cciss_scsi.h
+++ b/drivers/block/cciss_scsi.h
@@ -36,13 +36,9 @@
addressible natively, and may in fact turn
out to be not scsi at all. */
-#define SCSI_CCISS_CAN_QUEUE 2
/*
-Note, cmd_per_lun could give us some trouble, so I'm setting it very low.
-Likewise, SCSI_CCISS_CAN_QUEUE is set very conservatively.
-
If the upper scsi layer tries to track how many commands we have
outstanding, it will be operating under the misapprehension that it is
the only one sending us requests. We also have the block interface,