diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-29 12:42:07 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-29 12:42:07 +0300 |
| commit | 416b0c0faf634abc09568885cb95266ce669c606 (patch) | |
| tree | bf63b94f57246fbf264c93bfdd6233395b07ef89 /include/linux/blkdev.h | |
| parent | c0bb80cfa3c37fd92f066e328d83656067519a5f (diff) | |
| parent | 9c3a815f471a84811cf8021cf64aae3b8081dfde (diff) | |
| download | linux-416b0c0faf634abc09568885cb95266ce669c606.tar.xz | |
Merge branch 'linus' into x86/apic, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 { #if defined(CONFIG_BLK_DEV_BSG) bsg_job_fn *bsg_job_fn; - int bsg_job_size; struct bsg_class_device bsg_dev; #endif |