From f79dc1f6eda9ec856604750a9d1b3bdec9a8854d Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 23 Feb 2011 19:54:53 +0100
Subject: [PATCH] --- yaml --- r: 234681 b: refs/heads/master c:
 abb0052289e58140d933b29491f59e4be0a19727 h: refs/heads/master i:   234679:
 174d32d317b45df7f299cad92d7247c1805511a5 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/include/asm/io_apic.h | 4 ++++
 trunk/arch/x86/kernel/apic/io_apic.c | 4 ----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 568f08cec2e0..cff8ff6b8d8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 710dcda64369e3f3704a0eee502ce27dbf9fedc1
+refs/heads/master: abb0052289e58140d933b29491f59e4be0a19727
diff --git a/trunk/arch/x86/include/asm/io_apic.h b/trunk/arch/x86/include/asm/io_apic.h
index be61e22dd9ea..c4bd267dfc50 100644
--- a/trunk/arch/x86/include/asm/io_apic.h
+++ b/trunk/arch/x86/include/asm/io_apic.h
@@ -95,6 +95,10 @@ struct IR_IO_APIC_route_entry {
 		index		: 15;
 } __attribute__ ((packed));
 
+#define IOAPIC_AUTO     -1
+#define IOAPIC_EDGE     0
+#define IOAPIC_LEVEL    1
+
 #ifdef CONFIG_X86_IO_APIC
 
 /*
diff --git a/trunk/arch/x86/kernel/apic/io_apic.c b/trunk/arch/x86/kernel/apic/io_apic.c
index 46913ef88ea4..8d23e831a45e 100644
--- a/trunk/arch/x86/kernel/apic/io_apic.c
+++ b/trunk/arch/x86/kernel/apic/io_apic.c
@@ -1216,10 +1216,6 @@ void __setup_vector_irq(int cpu)
 static struct irq_chip ioapic_chip;
 static struct irq_chip ir_ioapic_chip;
 
-#define IOAPIC_AUTO     -1
-#define IOAPIC_EDGE     0
-#define IOAPIC_LEVEL    1
-
 #ifdef CONFIG_X86_32
 static inline int IO_APIC_irq_trigger(int irq)
 {