diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-11-10 08:51:27 -0500 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-11-10 08:51:27 -0500 |
| commit | 00e375e7e962f938f6b3c93e4cd097a5e26cc788 (patch) | |
| tree | 9aacf8566c688273af830fc4e50186810068b028 /drivers/block/drbd/drbd_proc.c | |
| parent | f85acd81aa623e3dcf268c90e5cd8ecf36830984 (diff) | |
| parent | 4205df34003eec4371020872cdfa228ffae5bd6a (diff) | |
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) | |||
| 158 | [WO_none] = 'n', | 158 | [WO_none] = 'n', |
| 159 | [WO_drain_io] = 'd', | 159 | [WO_drain_io] = 'd', |
| 160 | [WO_bdev_flush] = 'f', | 160 | [WO_bdev_flush] = 'f', |
| 161 | [WO_bio_barrier] = 'b', | ||
| 162 | }; | 161 | }; |
| 163 | 162 | ||
| 164 | seq_printf(seq, "version: " REL_VERSION " (api:%d/proto:%d-%d)\n%s\n", | 163 | seq_printf(seq, "version: " REL_VERSION " (api:%d/proto:%d-%d)\n%s\n", |