Commit 4d5d8e9d3e55100bc12cf17a5ebc8a3c70befd38
Committed by
Jens Axboe
1 parent
4e97182a22
Exists in
master
and in
20 other branches
bsg: Fix build for CONFIG_BLOCK=n
BLK_DEV_BSG was added outside of the if BLOCK check, which allows it to be enabled when CONFIG_BLOCK=n. This leads to many screenlengths of errors, starting with a parse error on the request_queue_t definition. Obviously this wasn't intended for CONFIG_BLOCK=n usage, so just move the option back in to the block. Caught with a randconfig on sh. Signed-off-by: Paul Mundt <lethal@linux-sh.org> -- block/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff
block/Kconfig
... | ... | @@ -49,8 +49,6 @@ |
49 | 49 | |
50 | 50 | If unsure, say Y. |
51 | 51 | |
52 | -endif # BLOCK | |
53 | - | |
54 | 52 | config BLK_DEV_BSG |
55 | 53 | bool "Block layer SG support v4 (EXPERIMENTAL)" |
56 | 54 | depends on EXPERIMENTAL |
... | ... | @@ -63,6 +61,8 @@ |
63 | 61 | with bidirectional data transfers and generic request/response |
64 | 62 | protocols (e.g. Task Management Functions and SMP in Serial |
65 | 63 | Attached SCSI). |
64 | + | |
65 | +endif # BLOCK | |
66 | 66 | |
67 | 67 | source block/Kconfig.iosched |