diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
| commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
| tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /arch/mips/kvm | |
| parent | fe2a801b50c0bb8039d627e5ae1fec249d10ff39 (diff) | |
| parent | f1d6e17f540af37bb1891480143669ba7636c4cf (diff) | |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'arch/mips/kvm')
| -rw-r--r-- | arch/mips/kvm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/kvm/Kconfig b/arch/mips/kvm/Kconfig index 2c15590e55f7..30e334e823bd 100644 --- a/arch/mips/kvm/Kconfig +++ b/arch/mips/kvm/Kconfig | |||
| @@ -5,7 +5,6 @@ source "virt/kvm/Kconfig" | |||
| 5 | 5 | ||
| 6 | menuconfig VIRTUALIZATION | 6 | menuconfig VIRTUALIZATION |
| 7 | bool "Virtualization" | 7 | bool "Virtualization" |
| 8 | depends on HAVE_KVM | ||
| 9 | ---help--- | 8 | ---help--- |
| 10 | Say Y here to get to see options for using your Linux host to run | 9 | Say Y here to get to see options for using your Linux host to run |
| 11 | other operating systems inside virtual machines (guests). | 10 | other operating systems inside virtual machines (guests). |