diff options
| author | Linus Torvalds | 2006-10-12 16:49:46 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-10-12 16:49:46 +0200 |
| commit | da79cbae39516e7bdee8b0edb366e8ff016a9d3e (patch) | |
| tree | 44ebc3f7d3dc1e0c9495b9749eec186daecdb948 /include/linux | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [PATCH] block layer: ioprio_best function fix (diff) | |
| download | kernel-qcow2-linux-da79cbae39516e7bdee8b0edb366e8ff016a9d3e.tar.gz kernel-qcow2-linux-da79cbae39516e7bdee8b0edb366e8ff016a9d3e.tar.xz kernel-qcow2-linux-da79cbae39516e7bdee8b0edb366e8ff016a9d3e.zip | |
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
[PATCH] block layer: ioprio_best function fix
[PATCH] ide-cd: fix breakage with internally queued commands
[PATCH] block layer: elv_iosched_show should get elv_list_lock
[PATCH] splice: fix pipe_to_file() ->prepare_write() error path
[PATCH] block layer: elevator_find function cleanup
[PATCH] elevator: elevator_type member not used
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blkdev.h | 1 | ||||
| -rw-r--r-- | include/linux/elevator.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 26f7856ff812..d370d2cfe138 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -157,6 +157,7 @@ enum rq_cmd_type_bits { REQ_TYPE_ATA_CMD, REQ_TYPE_ATA_TASK, REQ_TYPE_ATA_TASKFILE, + REQ_TYPE_ATA_PC, }; /* diff --git a/include/linux/elevator.h b/include/linux/elevator.h index b3370ef5164d..2fa9f1144228 100644 --- a/include/linux/elevator.h +++ b/include/linux/elevator.h @@ -70,7 +70,6 @@ struct elevator_type { struct list_head list; struct elevator_ops ops; - struct elevator_type *elevator_type; struct elv_fs_entry *elevator_attrs; char elevator_name[ELV_NAME_MAX]; struct module *elevator_owner; |