diff --git a/[refs] b/[refs] index 9c3f9e5d1e04..21469a3038c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f22cf8eb485260ac6e32a614121d44998d83a69a +refs/heads/master: 04679f34c141a0591e525d392929efc249440a7c diff --git a/trunk/drivers/virtio/Kconfig b/trunk/drivers/virtio/Kconfig index f38b17a86c35..271be8059b93 100644 --- a/trunk/drivers/virtio/Kconfig +++ b/trunk/drivers/virtio/Kconfig @@ -27,8 +27,7 @@ config VIRTIO_PCI config VIRTIO_BALLOON tristate "Virtio balloon driver (EXPERIMENTAL)" - select VIRTIO - select VIRTIO_RING + depends on EXPERIMENTAL && VIRTIO ---help--- This driver supports increasing and decreasing the amount of memory within a KVM guest.