From bfccec565271baf96c3abc1c09ab0edeba328104 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Thu, 1 Oct 2009 13:45:13 -0700
Subject: [PATCH] --- yaml --- r: 166912 b: refs/heads/master c:
 c416850580cbdcca7e601dda8a243f5cac35aa88 h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/sparc/include/asm/hardirq_32.h | 12 +-----------
 trunk/arch/sparc/include/asm/irq_32.h     |  4 ++--
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 31bf1b04c3c3..76c2363fe3a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d17513889a8b754c5872b6b46e6f7822338a0b79
+refs/heads/master: c416850580cbdcca7e601dda8a243f5cac35aa88
diff --git a/trunk/arch/sparc/include/asm/hardirq_32.h b/trunk/arch/sparc/include/asm/hardirq_32.h
index 4f63ed8df551..162007643cdc 100644
--- a/trunk/arch/sparc/include/asm/hardirq_32.h
+++ b/trunk/arch/sparc/include/asm/hardirq_32.h
@@ -7,17 +7,7 @@
 #ifndef __SPARC_HARDIRQ_H
 #define __SPARC_HARDIRQ_H
 
-#include <linux/threads.h>
-#include <linux/spinlock.h>
-#include <linux/cache.h>
-
-/* entry.S is sensitive to the offsets of these fields */ /* XXX P3 Is it? */
-typedef struct {
-	unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */
-
 #define HARDIRQ_BITS    8
+#include <asm-generic/hardirq.h>
 
 #endif /* __SPARC_HARDIRQ_H */
diff --git a/trunk/arch/sparc/include/asm/irq_32.h b/trunk/arch/sparc/include/asm/irq_32.h
index ea43057d4763..cbf4801deaaf 100644
--- a/trunk/arch/sparc/include/asm/irq_32.h
+++ b/trunk/arch/sparc/include/asm/irq_32.h
@@ -6,10 +6,10 @@
 #ifndef _SPARC_IRQ_H
 #define _SPARC_IRQ_H
 
-#include <linux/interrupt.h>
-
 #define NR_IRQS    16
 
+#include <linux/interrupt.h>
+
 #define irq_canonicalize(irq)	(irq)
 
 extern void __init init_IRQ(void);