From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 20 Feb 2009 16:40:43 +0000 (+0100)
Subject: Merge branch 'x86/urgent' into x86/core
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3b6f7b9beb553ea71a6d4d76ba82cf32eb6dadd2;p=linux-2.6-omap-h63xx.git

Merge branch 'x86/urgent' into x86/core
---

3b6f7b9beb553ea71a6d4d76ba82cf32eb6dadd2
diff --cc arch/ia64/include/asm/kvm.h
index 116761ca462,bfa86b6af7c..2b0a38e8470
--- a/arch/ia64/include/asm/kvm.h
+++ b/arch/ia64/include/asm/kvm.h
@@@ -21,9 -21,14 +21,13 @@@
   *
   */
  
 -#include <asm/types.h>
 -
 +#include <linux/types.h>
  #include <linux/ioctl.h>
  
+ /* Select x86 specific features in <linux/kvm.h> */
+ #define __KVM_HAVE_IOAPIC
+ #define __KVM_HAVE_DEVICE_ASSIGNMENT
+ 
  /* Architectural interrupt line count. */
  #define KVM_NR_INTERRUPTS 256