From 6d937ee0500fec7d75adfea15a2b7675c44d4a85 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Tue, 4 Aug 2009 16:52:44 +0200
Subject: [PATCH] --- yaml --- r: 162629 b: refs/heads/master c:
 d668bf0a0d73daea4eaaf748435752f52cc077aa h: refs/heads/master i:   162627:
 7ded2419aa194b0f27466318d1d1aab4643340b1 v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/m68k/include/asm/hardirq_no.h | 10 +---------
 trunk/arch/m68knommu/kernel/irq.c        |  5 -----
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 016b9bb72e3a..bb4d76607c8a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3aa42c6b26f502f6502ea2e07908d5768a3dd35
+refs/heads/master: d668bf0a0d73daea4eaaf748435752f52cc077aa
diff --git a/trunk/arch/m68k/include/asm/hardirq_no.h b/trunk/arch/m68k/include/asm/hardirq_no.h
index bfad28149a49..b44b14be87d9 100644
--- a/trunk/arch/m68k/include/asm/hardirq_no.h
+++ b/trunk/arch/m68k/include/asm/hardirq_no.h
@@ -1,16 +1,8 @@
 #ifndef __M68K_HARDIRQ_H
 #define __M68K_HARDIRQ_H
 
-#include <linux/cache.h>
-#include <linux/threads.h>
 #include <asm/irq.h>
 
-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
 
 /*
@@ -22,6 +14,6 @@ typedef struct {
 # error HARDIRQ_BITS is too low!
 #endif
 
-void ack_bad_irq(unsigned int irq);
+#include <asm-generic/hardirq.h>
 
 #endif /* __M68K_HARDIRQ_H */
diff --git a/trunk/arch/m68knommu/kernel/irq.c b/trunk/arch/m68knommu/kernel/irq.c
index 56e0f4c55a67..9e0c100447ca 100644
--- a/trunk/arch/m68knommu/kernel/irq.c
+++ b/trunk/arch/m68knommu/kernel/irq.c
@@ -29,11 +29,6 @@ asmlinkage void do_IRQ(int irq, struct pt_regs *regs)
 	set_irq_regs(oldregs);
 }
 
-void ack_bad_irq(unsigned int irq)
-{
-	printk(KERN_ERR "IRQ: unexpected irq=%d\n", irq);
-}
-
 static struct irq_chip m_irq_chip = {
 	.name		= "M68K-INTC",
 	.enable		= enable_vector,