Merge tag 'please-pull-uapi-fix' of git://git.kernel.org/pub/scm/linu…

…x/kernel/git/aegl/linux Pull ia64 fix from Tony Luck: "Fix from dhowells for UAPI fallout" * tag 'please-pull-uapi-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: UAPI: Make arch/ia64/include/asm/kvm_para.h generic
git-mirror · Oct 24, 2012 · 62472ef · 62472ef
2 parents 2d1f4c8 + 7e3cdf2
commit 62472ef
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 34 deletions.
diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild
@@ -1,3 +1,4 @@
 
 generic-y += clkdev.h
 generic-y += exec.h
+generic-y += kvm_para.h
diff --git a/arch/ia64/include/asm/kvm_para.h b/arch/ia64/include/asm/kvm_para.h