diff --git a/[refs] b/[refs] index e0052ac42ba0..4630471b56ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1e87c7ee65a20b10faf7e59dbe2cc934c32473b +refs/heads/master: 26e673c3003bc8f24bdbbdcb8bc91a78556f579a diff --git a/trunk/arch/powerpc/include/asm/kvm_para.h b/trunk/arch/powerpc/include/asm/kvm_para.h index d79fd0910964..50533f9adf40 100644 --- a/trunk/arch/powerpc/include/asm/kvm_para.h +++ b/trunk/arch/powerpc/include/asm/kvm_para.h @@ -21,7 +21,6 @@ #define __POWERPC_KVM_PARA_H__ #include -#include struct kvm_vcpu_arch_shared { __u64 scratch1; @@ -54,6 +53,8 @@ struct kvm_vcpu_arch_shared { #ifdef CONFIG_KVM_GUEST +#include + static inline int kvm_para_available(void) { struct device_node *hyper_node;