diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-04-17 16:37:18 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-05-05 15:40:07 -0400 |
| commit | b0b93b48a30e809240ddd7449a6ad60a5ddf7b4d (patch) | |
| tree | 52f9e294f03b76ab9cdbf8b48b45ca0263a7b1ce /include | |
| parent | b42171ef7d938a66fa52e66a3d911ed63770b5ca (diff) | |
block: move REQ_TYPE_SENSE to the ide driver
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 1 | ||||
| -rw-r--r-- | include/linux/ide.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 9cb4d80a4987..6076b9e18dcb 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -75,7 +75,6 @@ struct request_list { | |||
| 75 | enum rq_cmd_type_bits { | 75 | enum rq_cmd_type_bits { |
| 76 | REQ_TYPE_FS = 1, /* fs request */ | 76 | REQ_TYPE_FS = 1, /* fs request */ |
| 77 | REQ_TYPE_BLOCK_PC, /* scsi command */ | 77 | REQ_TYPE_BLOCK_PC, /* scsi command */ |
| 78 | REQ_TYPE_SENSE, /* sense request */ | ||
| 79 | REQ_TYPE_PM_SUSPEND, /* suspend request */ | 78 | REQ_TYPE_PM_SUSPEND, /* suspend request */ |
| 80 | REQ_TYPE_PM_RESUME, /* resume request */ | 79 | REQ_TYPE_PM_RESUME, /* resume request */ |
| 81 | REQ_TYPE_PM_SHUTDOWN, /* shutdown request */ | 80 | REQ_TYPE_PM_SHUTDOWN, /* shutdown request */ |
diff --git a/include/linux/ide.h b/include/linux/ide.h index 62ac399144a6..9856b7d455d9 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
| @@ -43,6 +43,7 @@ struct device; | |||
| 43 | enum ata_cmd_type_bits { | 43 | enum ata_cmd_type_bits { |
| 44 | REQ_TYPE_ATA_TASKFILE = REQ_TYPE_DRV_PRIV + 1, | 44 | REQ_TYPE_ATA_TASKFILE = REQ_TYPE_DRV_PRIV + 1, |
| 45 | REQ_TYPE_ATA_PC, | 45 | REQ_TYPE_ATA_PC, |
| 46 | REQ_TYPE_ATA_SENSE, /* sense request */ | ||
| 46 | }; | 47 | }; |
| 47 | 48 | ||
| 48 | /* Error codes returned in rq->errors to the higher part of the driver. */ | 49 | /* Error codes returned in rq->errors to the higher part of the driver. */ |
