diff options
| author | Ingo Molnar | 2012-03-26 17:18:44 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2012-03-26 17:19:03 +0200 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /arch/m68k/include/asm/system.h | |
| parent | perf: Move mmap page data_head offset assertion out of header (diff) | |
| parent | Merge tag 'stable/for-linus-3.4-tag-two' of git://git.kernel.org/pub/scm/linu... (diff) | |
| download | kernel-qcow2-linux-7fd52392c56361a40f0c630a82b36b95ca31eac6.tar.gz kernel-qcow2-linux-7fd52392c56361a40f0c630a82b36b95ca31eac6.tar.xz kernel-qcow2-linux-7fd52392c56361a40f0c630a82b36b95ca31eac6.zip | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m68k/include/asm/system.h')
| -rw-r--r-- | arch/m68k/include/asm/system.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/system.h b/arch/m68k/include/asm/system.h index 47b01f4726bc..8dc68178716c 100644 --- a/arch/m68k/include/asm/system.h +++ b/arch/m68k/include/asm/system.h @@ -3,6 +3,7 @@ #include <linux/linkage.h> #include <linux/kernel.h> +#include <linux/bug.h> #include <linux/irqflags.h> #include <asm/segment.h> #include <asm/entry.h> |