diff options
| author | Jens Axboe | 2010-11-10 14:51:27 +0100 |
|---|---|---|
| committer | Jens Axboe | 2010-11-10 14:51:27 +0100 |
| commit | 00e375e7e962f938f6b3c93e4cd097a5e26cc788 (patch) | |
| tree | 9aacf8566c688273af830fc4e50186810068b028 /drivers/block/drbd/drbd_proc.c | |
| parent | ioprio: rcu_read_lock/unlock protect find_task_by_vpid call (V2) (diff) | |
| parent | cciss: remove controllers supported by hpsa (diff) | |
| download | kernel-qcow2-linux-00e375e7e962f938f6b3c93e4cd097a5e26cc788.tar.gz kernel-qcow2-linux-00e375e7e962f938f6b3c93e4cd097a5e26cc788.tar.xz kernel-qcow2-linux-00e375e7e962f938f6b3c93e4cd097a5e26cc788.zip | |
Merge branch 'for-2.6.37/drivers' into for-linus
Conflicts:
drivers/block/cciss.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block/drbd/drbd_proc.c')
| -rw-r--r-- | drivers/block/drbd/drbd_proc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_proc.c b/drivers/block/drbd/drbd_proc.c index ad325c5d0ce1..7e6ac307e2de 100644 --- a/drivers/block/drbd/drbd_proc.c +++ b/drivers/block/drbd/drbd_proc.c @@ -158,7 +158,6 @@ static int drbd_seq_show(struct seq_file *seq, void *v) [WO_none] = 'n', [WO_drain_io] = 'd', [WO_bdev_flush] = 'f', - [WO_bio_barrier] = 'b', }; seq_printf(seq, "version: " REL_VERSION " (api:%d/proto:%d-%d)\n%s\n", |