Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-03 17:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds 2010-11-05 07:54:40 -07:00
commit 9a8a0cadde
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/m68k/include/asm/irqflags.h
View File

@ -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>

1
arch/m68k/include/asm/machdep.h
View File

@ -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 */