From 166ca0e1458487748bed2f5ecb4ef8df50cc9d5d Mon Sep 17 00:00:00 2001
From: Tony Luck <tony.luck@intel.com>
Date: Mon, 20 Sep 2010 13:15:07 -0700
Subject: [PATCH] --- yaml --- r: 211950 b: refs/heads/master c:
 3c4ea5b4985ecf831e22034d5d5db6e6391f3911 h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/arch/ia64/include/asm/hardirq.h | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index c42363364e58..05e0282fa071 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57fa7214330be2e292ddb1402834ff0b221ef29a
+refs/heads/master: 3c4ea5b4985ecf831e22034d5d5db6e6391f3911
diff --git a/trunk/arch/ia64/include/asm/hardirq.h b/trunk/arch/ia64/include/asm/hardirq.h
index d514cd9edb49..8fb7d33a661f 100644
--- a/trunk/arch/ia64/include/asm/hardirq.h
+++ b/trunk/arch/ia64/include/asm/hardirq.h
@@ -6,12 +6,6 @@
  *	David Mosberger-Tang <davidm@hpl.hp.com>
  */
 
-
-#include <linux/threads.h>
-#include <linux/irq.h>
-
-#include <asm/processor.h>
-
 /*
  * No irq_cpustat_t for IA-64.  The data is held in the per-CPU data structure.
  */
@@ -20,6 +14,11 @@
 
 #define local_softirq_pending()		(local_cpu_data->softirq_pending)
 
+#include <linux/threads.h>
+#include <linux/irq.h>
+
+#include <asm/processor.h>
+
 extern void __iomem *ipi_base_addr;
 
 void ack_bad_irq(unsigned int irq);