diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
commit | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch) | |
tree | e99502f671b83f6898a77b78f88fdc67be8aa251 /target/linux/config/Config.in.virtio | |
parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) |
resolve merge conflict
Diffstat (limited to 'target/linux/config/Config.in.virtio')
-rw-r--r-- | target/linux/config/Config.in.virtio | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/target/linux/config/Config.in.virtio b/target/linux/config/Config.in.virtio index 71d67cc94..f2eb577cd 100644 --- a/target/linux/config/Config.in.virtio +++ b/target/linux/config/Config.in.virtio @@ -1,3 +1,6 @@ +menu "Virtio driver support" +depends on !ADK_TARGET_QEMU_WITH_VIRTIO && ADK_HARDWARE_QEMU + config ADK_KERNEL_VIRTIO boolean @@ -5,28 +8,17 @@ config ADK_KERNEL_VIRTIO_PCI boolean config ADK_KERNEL_VIRTIO_NET - boolean - -config ADK_KERNEL_VIRTIO_BLK - boolean - -menu "Virtio driver support" -depends on !ADK_TARGET_QEMU_WITH_VIRTIO && ADK_HARDWARE_QEMU - -config ADK_KPACKAGE_KMOD_VIRTIO_NET prompt "Virtio net driver" tristate - depends on !ADK_KERNEL_VIRTIO_NET select ADK_KERNEL_VIRTIO select ADK_KERNEL_VIRTIO_PCI default n help Enables support for Virtio Net driver. -config ADK_KPACKAGE_KMOD_VIRTIO_BLK +config ADK_KERNEL_VIRTIO_BLK prompt "Virtio block driver" tristate - depends on !ADK_KERNEL_VIRTIO_BLK select ADK_KERNEL_VIRTIO select ADK_KERNEL_VIRTIO_PCI select ADK_KERNEL_BLK_DEV |