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

18eb54cf · Gleb Natapov · 9b132fbe · 1509ae56 · 18eb54cf
Commit 18eb54cf authored Dec 20, 2012 by Gleb Natapov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

arch/powerpc/include/uapi/asm/kvm_para.h arch/powerpc/include/uapi/asm/kvm_para.h +1 -1

No files found.
--- 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