Merge branch 'kvm-ppc-3.8' of https://github.com/agraf/linux-2.6 into…

… master
mariux64 · Dec 20, 2012 · 18eb54c · 18eb54c
2 parents 9b132fb + 1509ae5
commit 18eb54c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/arch/powerpc/include/uapi/asm/kvm_para.h b/arch/powerpc/include/uapi/asm/kvm_para.h
@@ -78,7 +78,7 @@ struct kvm_vcpu_arch_shared {
 
 #define KVM_HCALL_TOKEN(num)     _EV_HCALL_TOKEN(EV_KVM_VENDOR_ID, num)
 
-#include <uapi/asm/epapr_hcalls.h>
+#include <asm/epapr_hcalls.h>
 
 #define KVM_FEATURE_MAGIC_PAGE	1