diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-12 06:17:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-12 06:17:36 -0400 |
| commit | 6cda3eb62ef42aa5acd649bf99c8db544e0f4051 (patch) | |
| tree | 93f74ca002f5756c8e157611174f9540b5cf41c0 /arch/m68k/kernel/sun3-head.S | |
| parent | b9c61b70075c87a8612624736faf4a2de5b1ed30 (diff) | |
| parent | cec6be6d1069d697beb490bbb40a290d5ff554a2 (diff) | |
Merge branch 'x86/apic' into irq/numa
Merge reason: both topics modify the APIC code but were able to do it in
parallel so far. An upcoming patch generates a conflict so
merge them to avoid the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m68k/kernel/sun3-head.S')
| -rw-r--r-- | arch/m68k/kernel/sun3-head.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/kernel/sun3-head.S b/arch/m68k/kernel/sun3-head.S index 9e5c3e57c598..43036bf4aeed 100644 --- a/arch/m68k/kernel/sun3-head.S +++ b/arch/m68k/kernel/sun3-head.S | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #include <linux/linkage.h> | 1 | #include <linux/linkage.h> |
| 2 | #include <linux/init.h> | ||
| 2 | 3 | ||
| 3 | #include <asm/entry.h> | 4 | #include <asm/entry.h> |
| 4 | #include <asm/page.h> | 5 | #include <asm/page.h> |