diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-13 18:02:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-13 18:02:22 -0400 |
| commit | b5c851a88a369854c04e511cefb84ea2d0cfa209 (patch) | |
| tree | 55084d3d51708f90f27d0a70db5ab63916942f14 /arch/mn10300/kernel/setup.c | |
| parent | eb02ce017dd83985041a7e54c6449f92d53b026f (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: merge latest tracing fixes to avoid conflicts in
kernel/trace/trace_events_filter.c with upcoming change
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mn10300/kernel/setup.c')
| -rw-r--r-- | arch/mn10300/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/setup.c b/arch/mn10300/kernel/setup.c index e1d88ab51008..71414e19fd16 100644 --- a/arch/mn10300/kernel/setup.c +++ b/arch/mn10300/kernel/setup.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include <asm/setup.h> | 30 | #include <asm/setup.h> |
| 31 | #include <asm/io.h> | 31 | #include <asm/io.h> |
| 32 | #include <asm/smp.h> | 32 | #include <asm/smp.h> |
| 33 | #include <asm/proc/proc.h> | 33 | #include <proc/proc.h> |
| 34 | #include <asm/busctl-regs.h> | 34 | #include <asm/busctl-regs.h> |
| 35 | #include <asm/fpu.h> | 35 | #include <asm/fpu.h> |
| 36 | #include <asm/sections.h> | 36 | #include <asm/sections.h> |