Merge git://git.infradead.org/mtd-2.6

[karo-tx-linux.git] / include / linux / kvm_para.h

diff --git a/include/linux/kvm_para.h b/include/linux/kvm_para.h
index ac2015a2501242f685c9bc34db6ff885170bad4b..47a070b0520e1ee766b5b4b26816d12d9f45cad8 100644 (file)
--- a/include/linux/kvm_para.h
+++ b/include/linux/kvm_para.h
@@ -26,11 +26,6 @@
 #include <asm/kvm_para.h>
 
 #ifdef __KERNEL__
-#ifdef CONFIG_KVM_GUEST
-void __init kvm_guest_init(void);
-#else
-#define kvm_guest_init() do { } while (0)
-#endif
 
 static inline int kvm_para_has_feature(unsigned int feature)
 {