Merge branch 'can/at91_can-for-net-2.6' of git://git.pengutronix.de/git/mkl/linux-2.6

[pandora-kernel.git] / virt / kvm / Kconfig

diff --git a/virt/kvm/Kconfig b/virt/kvm/Kconfig
index daece36..f63ccb0 100644 (file)
--- a/virt/kvm/Kconfig
+++ b/virt/kvm/Kconfig
@@ -12,3 +12,9 @@ config HAVE_KVM_EVENTFD
 
 config KVM_APIC_ARCHITECTURE
        bool
+
+config KVM_MMIO
+       bool
+
+config KVM_ASYNC_PF
+       bool