diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-08-05 04:32:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-08-05 04:33:55 -0400 |
| commit | 3272cab4063467410802367a8d69f06c65b2a866 (patch) | |
| tree | 1c665f8572b0aab2a5343d32b5eaa6713669b04f /kernel/debug/debug_core.c | |
| parent | f629299b544b6cc12b4e3e85fec96f4ce5809482 (diff) | |
| parent | 140d0b2108faebc77c6523296e211e509cb9f5f9 (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: Include most of the merge window trees, to do fixes on top.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/debug/debug_core.c')
| -rw-r--r-- | kernel/debug/debug_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c index bad6786dee88..0d7c08784efb 100644 --- a/kernel/debug/debug_core.c +++ b/kernel/debug/debug_core.c | |||
| @@ -51,7 +51,7 @@ | |||
| 51 | 51 | ||
| 52 | #include <asm/cacheflush.h> | 52 | #include <asm/cacheflush.h> |
| 53 | #include <asm/byteorder.h> | 53 | #include <asm/byteorder.h> |
| 54 | #include <asm/atomic.h> | 54 | #include <linux/atomic.h> |
| 55 | #include <asm/system.h> | 55 | #include <asm/system.h> |
| 56 | 56 | ||
| 57 | #include "debug_core.h" | 57 | #include "debug_core.h" |