summaryrefslogtreecommitdiff
path: root/include/linux/blkdev.h
diff options
context:
space:
mode:
authorOleg Drokin <green@angband.namesys.com>2002-06-06 17:45:43 +0400
committerOleg Drokin <green@angband.namesys.com>2002-06-06 17:45:43 +0400
commit556a2071e454ca342f4caeb9964f7bb28552be21 (patch)
tree54eebe98464fae6b34f9763869319b116d55cc45 /include/linux/blkdev.h
parent7bbbc1b5a05a37e4c64f59c1c1f88e088ef3861e (diff)
parent50da7d0e7884c4ff01ab8aa9cf467b721ef681bf (diff)
Merge angband.namesys.com:/home/green/bk/linux-2.5
into angband.namesys.com:/home/green/bk_work/reiser3-linux-2.5
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r--include/linux/blkdev.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index a3e1c02d6d63..c2645da2d975 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -81,13 +81,11 @@ enum rq_flag_bits {
/*
* for ATA/ATAPI devices
*/
- __REQ_DRIVE_ACB,
-
__REQ_PC, /* packet command (special) */
__REQ_BLOCK_PC, /* queued down pc from block layer */
__REQ_SENSE, /* sense retrival */
- __REQ_SPECIAL, /* driver special command (currently reset) */
+ __REQ_SPECIAL, /* driver suplied command */
__REQ_NR_BITS, /* stops here */
};
@@ -100,7 +98,6 @@ enum rq_flag_bits {
#define REQ_STARTED (1 << __REQ_STARTED)
#define REQ_DONTPREP (1 << __REQ_DONTPREP)
#define REQ_QUEUED (1 << __REQ_QUEUED)
-#define REQ_DRIVE_ACB (1 << __REQ_DRIVE_ACB)
#define REQ_PC (1 << __REQ_PC)
#define REQ_BLOCK_PC (1 << __REQ_BLOCK_PC)
#define REQ_SENSE (1 << __REQ_SENSE)