diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-19 06:49:35 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-19 06:49:35 -0500 |
| commit | 9e18e1869f5ebac69f0d881fe97a198ebc0834db (patch) | |
| tree | 18c5b5c185d39cbb50fa652b5e08d047c8cf06e1 /arch/m68k/include/asm/irqflags.h | |
| parent | 04af964f9cb666caa7c1436d003f8fac0f1fedcc (diff) | |
| parent | 460ed699f4c943e1ec4a8458869eb532fe31fd16 (diff) | |
Merge branch 'next-samsung-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into for-2.6.38
Diffstat (limited to 'arch/m68k/include/asm/irqflags.h')
| -rw-r--r-- | arch/m68k/include/asm/irqflags.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/irqflags.h b/arch/m68k/include/asm/irqflags.h index 4a5b284a155..7ef4115b8c4 100644 --- a/arch/m68k/include/asm/irqflags.h +++ b/arch/m68k/include/asm/irqflags.h | |||
| @@ -2,7 +2,9 @@ | |||
| 2 | #define _M68K_IRQFLAGS_H | 2 | #define _M68K_IRQFLAGS_H |
| 3 | 3 | ||
| 4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 5 | #ifdef CONFIG_MMU | ||
| 5 | #include <linux/hardirq.h> | 6 | #include <linux/hardirq.h> |
| 7 | #endif | ||
| 6 | #include <linux/preempt.h> | 8 | #include <linux/preempt.h> |
| 7 | #include <asm/thread_info.h> | 9 | #include <asm/thread_info.h> |
| 8 | #include <asm/entry.h> | 10 | #include <asm/entry.h> |