diff options
| author | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-08-28 12:04:15 -0400 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-08-28 12:04:15 -0400 |
| commit | 5ffa70b2a38befadb920b85fe87f5da2b4cff623 (patch) | |
| tree | 411b1d357731db5e2611f0ca67082a8c909b7d9d /include/linux/blkdev.h | |
| parent | 75864b301c91bf41ec2fb49ce4efb62fcb48b954 (diff) | |
| parent | cc4a41fe5541a73019a864883297bd5043aa6d98 (diff) | |
Merge tag 'v4.13-rc7' into mtd/next
Merge v4.13-rc7 back to resolve merge conflicts in
drivers/mtd/nand/nandsim.c and include/asm-generic/vmlinux.lds.h.
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 25f6a0cb27d3..2a5d52fa90f5 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -568,7 +568,6 @@ struct request_queue { | |||
| 568 | 568 | ||
| 569 | #if defined(CONFIG_BLK_DEV_BSG) | 569 | #if defined(CONFIG_BLK_DEV_BSG) |
| 570 | bsg_job_fn *bsg_job_fn; | 570 | bsg_job_fn *bsg_job_fn; |
| 571 | int bsg_job_size; | ||
| 572 | struct bsg_class_device bsg_dev; | 571 | struct bsg_class_device bsg_dev; |
| 573 | #endif | 572 | #endif |
| 574 | 573 | ||