Commit 9a8a0cad authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

* 'for-linus-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k, m68knommu: Do not include linux/hardirq.h in asm/irqflags.h
  m68knommu: add back in declaration of do_IRQ
parents ff8b16d7 ed35f654
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
#define _M68K_IRQFLAGS_H #define _M68K_IRQFLAGS_H
#include <linux/types.h> #include <linux/types.h>
#ifdef CONFIG_MMU
#include <linux/hardirq.h> #include <linux/hardirq.h>
#endif
#include <linux/preempt.h> #include <linux/preempt.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/entry.h> #include <asm/entry.h>
......
...@@ -40,5 +40,6 @@ extern unsigned long hw_timer_offset(void); ...@@ -40,5 +40,6 @@ extern unsigned long hw_timer_offset(void);
extern irqreturn_t arch_timer_interrupt(int irq, void *dummy); extern irqreturn_t arch_timer_interrupt(int irq, void *dummy);
extern void config_BSP(char *command, int len); extern void config_BSP(char *command, int len);
extern void do_IRQ(int irq, struct pt_regs *fp);
#endif /* _M68K_MACHDEP_H */ #endif /* _M68K_MACHDEP_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment