From 4d6008108bfbe029212eef38a8e08bbaad45ccfb Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Mon, 21 Sep 2009 17:04:07 -0700
Subject: [PATCH] --- yaml --- r: 164504 b: refs/heads/master c:
 45d80eea87c9f8292d2d33173d6866c0ec57238a h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/m68k/include/asm/hardirq_mm.h | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 935f528c143f..fec50738c694 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ad4c76b7afb71774b846b322ad2ae42f814331a
+refs/heads/master: 45d80eea87c9f8292d2d33173d6866c0ec57238a
diff --git a/trunk/arch/m68k/include/asm/hardirq_mm.h b/trunk/arch/m68k/include/asm/hardirq_mm.h
index 394ee946015c..554f65b6cd3b 100644
--- a/trunk/arch/m68k/include/asm/hardirq_mm.h
+++ b/trunk/arch/m68k/include/asm/hardirq_mm.h
@@ -1,16 +1,8 @@
 #ifndef __M68K_HARDIRQ_H
 #define __M68K_HARDIRQ_H
 
-#include <linux/threads.h>
-#include <linux/cache.h>
-
-/* entry.S is sensitive to the offsets of these fields */
-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