git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/amd-nb' into x86/apic-cleanups
[pandora-kernel.git]
/
arch
/
m68k
/
include
/
asm
/
irqflags.h
diff --git
a/arch/m68k/include/asm/irqflags.h
b/arch/m68k/include/asm/irqflags.h
index
4a5b284
..
7ef4115
100644
(file)
--- a/
arch/m68k/include/asm/irqflags.h
+++ b/
arch/m68k/include/asm/irqflags.h
@@
-2,7
+2,9
@@
#define _M68K_IRQFLAGS_H
#include <linux/types.h>
+#ifdef CONFIG_MMU
#include <linux/hardirq.h>
+#endif
#include <linux/preempt.h>
#include <asm/thread_info.h>
#include <asm/entry.h>