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.kvm | |
parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) |
resolve merge conflict
Diffstat (limited to 'target/linux/config/Config.in.kvm')
-rw-r--r-- | target/linux/config/Config.in.kvm | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/target/linux/config/Config.in.kvm b/target/linux/config/Config.in.kvm index 44ed992a4..5bba30871 100644 --- a/target/linux/config/Config.in.kvm +++ b/target/linux/config/Config.in.kvm @@ -6,13 +6,8 @@ config ADK_KERNEL_VIRTUALIZATION default n config ADK_KERNEL_KVM - bool - default n - -config ADK_KPACKAGE_KMOD_KVM - prompt "kmod-kvm.......................... Kernel-based Virtual Machine (KVM) support" + prompt "Kernel-based Virtual Machine (KVM) support" tristate - depends on !ADK_KERNEL_KVM select ADK_KERNEL_VIRTUALIZATION default n help @@ -23,20 +18,18 @@ config ADK_KPACKAGE_KMOD_KVM This module provides access to the hardware capabilities through a character device node named /dev/kvm. -config ADK_KPACKAGE_KMOD_KVM_AMD - prompt "kmod-kvm-amd...................... KVM for AMD processors support" +config ADK_KERNEL_KVM_AMD + prompt "KVM for AMD processors support" tristate - depends on !ADK_KERNEL_KVM select ADK_KERNEL_VIRTUALIZATION default n help Provides support for KVM on AMD processors equipped with the AMD-V (SVM) extensions. -config ADK_KPACKAGE_KMOD_KVM_INTEL - prompt "kmod-kvm-intel.................... KVM for Intel processors support" +config ADK_KERNEL_KVM_INTEL + prompt "KVM for Intel processors support" tristate - depends on !ADK_KERNEL_KVM select ADK_KERNEL_VIRTUALIZATION default n help |