We used to prompt CONFIG_VIRTIO_PCI_MODERN to user which may bring a
lot of confusion. E.g it may break various default configs which want
virtio devices.

So this patch fixes this by hide the prompot and document the
dependency.

Cc: Arnd Bergmann <a...@arndb.de>
Cc: Anders Roxell <anders.rox...@linaro.org>
Cc: Guenter Roeck <li...@roeck-us.net>
Reported-by: Naresh Kamboju <naresh.kamb...@linaro.org>
Fixes: 86b87c9d858b6 ("virtio-pci: introduce modern device module")
Signed-off-by: Jason Wang <jasow...@redhat.com>
---
 drivers/virtio/Kconfig | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig
index 6b9b81f4b8c2..be7df369bc2b 100644
--- a/drivers/virtio/Kconfig
+++ b/drivers/virtio/Kconfig
@@ -13,12 +13,12 @@ config ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS
          VIRTIO_F_ACCESS_PLATFORM
 
 config VIRTIO_PCI_MODERN
-       tristate "Modern Virtio PCI Device"
-       depends on PCI
+       tristate
        help
          Modern PCI device implementation. This module implements the
          basic probe and control for devices which are based on modern
-         PCI device with possible vendor specific extensions.
+         PCI device with possible vendor specific extensions. Any
+         module that selects this module must depend on PCI.
 
 menuconfig VIRTIO_MENU
        bool "Virtio drivers"
@@ -28,7 +28,8 @@ if VIRTIO_MENU
 
 config VIRTIO_PCI
        tristate "PCI driver for virtio devices"
-       depends on VIRTIO_PCI_MODERN
+       depends on PCI
+       select VIRTIO_PCI_MODERN
        select VIRTIO
        help
          This driver provides support for virtio based paravirtual device
-- 
2.18.1

Reply via email to