Merge branch 'x86/apic' into x86/irq

Reason: Update to latest genirq code conflicts with pending apic
	changes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 12 insertions, 0 deletions

diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h
index 47a30ff8e517..d87988bacf3e 100644
--- a/arch/x86/include/asm/apicdef.h
+++ b/arch/x86/include/asm/apicdef.h
@@ -426,4 +426,16 @@ struct local_apic {
 #else
  #define BAD_APICID 0xFFFFu
 #endif
+
+enum ioapic_irq_destination_types {
+        dest_Fixed              = 0,
+        dest_LowestPrio         = 1,
+        dest_SMI                = 2,
+        dest__reserved_1        = 3,
+        dest_NMI                = 4,
+        dest_INIT               = 5,
+        dest__reserved_2        = 6,
+        dest_ExtINT             = 7
+};
+
 #endif /* _ASM_X86_APICDEF_H */