diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 16:41:23 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 16:41:23 +0900 |
| commit | 4791d63bd40ec63c533060707dae0232b9969dc0 (patch) | |
| tree | 8e10fe91cea556c10f7d211b65c5f6bdd7ffeb55 /kernel/debug/debug_core.c | |
| parent | b3623080ff6974e696710b6c6eb4cdbf2bbab347 (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
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 @@ #include <asm/cacheflush.h> #include <asm/byteorder.h> -#include <asm/atomic.h> +#include <linux/atomic.h> #include <asm/system.h> #include "debug_core.h" |