From d6c38d63fdba01278e6de32d02af44641b504dcc Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Thu, 7 Oct 2021 16:40:08 +0100
Subject: [PATCH] Revert "ANDROID: modularize BLK_MQ_VIRTIO"

This reverts commit f1bdff93debe56dbafc0684fcfbfcaddd599be7b.

This option appears to be unused.

Bug: 191637574
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Change-Id: I3aca5b26ad2818c0a7438069b3fbd2bcd45f789b
---
 block/Kconfig         | 2 +-
 block/blk-mq-virtio.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/block/Kconfig b/block/Kconfig
index 5aedffa1e392..8e28ae7718bd 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -209,7 +209,7 @@ config BLK_MQ_PCI
 	default y
 
 config BLK_MQ_VIRTIO
-	tristate
+	bool
 	depends on BLOCK && VIRTIO
 	default y
 
diff --git a/block/blk-mq-virtio.c b/block/blk-mq-virtio.c
index 78b2b4faac69..7b8a42c35102 100644
--- a/block/blk-mq-virtio.c
+++ b/block/blk-mq-virtio.c
@@ -44,6 +44,3 @@ fallback:
 	return blk_mq_map_queues(qmap);
 }
 EXPORT_SYMBOL_GPL(blk_mq_virtio_map_queues);
-
-MODULE_DESCRIPTION("Virtio Device Default Queue Mapping");
-MODULE_LICENSE("GPL v2");