diff --git a/[refs] b/[refs]
index 0bc6bd87a137..7ffd81127b66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fa8937f3af8873e006ce324e7b2d3f9b2077b87
+refs/heads/master: 6b08035f3e64d8e474be166d682b52c95941662e
diff --git a/trunk/arch/ia64/kvm/irq.h b/trunk/arch/ia64/kvm/irq.h
index c6786e8b1bf4..c0785a728271 100644
--- a/trunk/arch/ia64/kvm/irq.h
+++ b/trunk/arch/ia64/kvm/irq.h
@@ -23,6 +23,8 @@
 #ifndef __IRQ_H
 #define __IRQ_H
 
+#include "lapic.h"
+
 static inline int irqchip_in_kernel(struct kvm *kvm)
 {
 	return 1;
diff --git a/trunk/virt/kvm/irq_comm.c b/trunk/virt/kvm/irq_comm.c
index c516d618d389..a70d805e0148 100644
--- a/trunk/virt/kvm/irq_comm.c
+++ b/trunk/virt/kvm/irq_comm.c
@@ -21,9 +21,7 @@
 
 #include <linux/kvm_host.h>
 
-#ifdef CONFIG_X86
 #include <asm/msidef.h>
-#endif
 
 #include "irq.h"