Merge tag 'xtensa-for-next-20140715' of git://github.com/jcmvbkbc/linux-xtensa into...

[firefly-linux-kernel-4.4.55.git] / drivers / virtio / Kconfig

diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig
index 8d5bddb56cb1a65c02ceac34bb84705bec53bd1b..c6683f2e396c3ef93effefe61d272627a4e4a24a 100644 (file)
--- a/drivers/virtio/Kconfig
+++ b/drivers/virtio/Kconfig
@@ -8,8 +8,8 @@ config VIRTIO
 menu "Virtio drivers"
 
 config VIRTIO_PCI
-       tristate "PCI driver for virtio devices (EXPERIMENTAL)"
-       depends on PCI && EXPERIMENTAL
+       tristate "PCI driver for virtio devices"
+       depends on PCI
        select VIRTIO
        ---help---
          This drivers provides support for virtio based paravirtual device
@@ -32,8 +32,8 @@ config VIRTIO_BALLOON
         If unsure, say M.
 
  config VIRTIO_MMIO
-       tristate "Platform bus driver for memory mapped virtio devices (EXPERIMENTAL)"
-       depends on HAS_IOMEM && EXPERIMENTAL
+       tristate "Platform bus driver for memory mapped virtio devices"
+       depends on HAS_IOMEM
        select VIRTIO
        ---help---
         This drivers provides support for memory mapped virtio