diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-23 23:19:31 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-23 23:19:31 -0500 |
| commit | 9b82e65d65c90faecc408bcdc14a0229736ed193 (patch) | |
| tree | 2cf5fd4f4df01c6488afd0046325405381a73e36 /drivers/virtio/Kconfig | |
| parent | 8174a06eba10a43375d1dd6f74c58a71519e3be5 (diff) | |
| parent | e6af578c5305be693a1bc7f4dc7b51dd82d41425 (diff) | |
Merge git://github.com/rustyrussell/linux
* git://github.com/rustyrussell/linux:
virtio-pci: make reset operation safer
virtio-mmio: Correct the name of the guest features selector
virtio: add HAS_IOMEM dependency to MMIO platform bus driver
Diffstat (limited to 'drivers/virtio/Kconfig')
| -rw-r--r-- | drivers/virtio/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig index 816ed08e7cf3..1a61939b85fc 100644 --- a/drivers/virtio/Kconfig +++ b/drivers/virtio/Kconfig | |||
| @@ -37,7 +37,7 @@ config VIRTIO_BALLOON | |||
| 37 | 37 | ||
| 38 | config VIRTIO_MMIO | 38 | config VIRTIO_MMIO |
| 39 | tristate "Platform bus driver for memory mapped virtio devices (EXPERIMENTAL)" | 39 | tristate "Platform bus driver for memory mapped virtio devices (EXPERIMENTAL)" |
| 40 | depends on EXPERIMENTAL | 40 | depends on HAS_IOMEM && EXPERIMENTAL |
| 41 | select VIRTIO | 41 | select VIRTIO |
| 42 | select VIRTIO_RING | 42 | select VIRTIO_RING |
| 43 | ---help--- | 43 | ---help--- |