diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-03-09 10:38:55 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-03-09 10:38:59 +0100 |
commit | c8b44163b754612fc4769fe1c5df00e98fc9d3c6 (patch) | |
tree | 77706ff1f2a72ed294885b6cf0a7c0de0f92d6df /arch/sh/include/asm/sections.h | |
parent | ac23f25355ef53f3d14352fcff3c6817527a9749 (diff) | |
parent | a5abba989deceb731047425812d268daf7536575 (diff) | |
download | talos-op-linux-c8b44163b754612fc4769fe1c5df00e98fc9d3c6.tar.gz talos-op-linux-c8b44163b754612fc4769fe1c5df00e98fc9d3c6.zip |
Merge commit 'v2.6.38-rc8' into x86/asm
Merge reason: Update with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sh/include/asm/sections.h')
-rw-r--r-- | arch/sh/include/asm/sections.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/sections.h b/arch/sh/include/asm/sections.h index a78701da775b..4a5350037c8f 100644 --- a/arch/sh/include/asm/sections.h +++ b/arch/sh/include/asm/sections.h @@ -3,7 +3,7 @@ #include <asm-generic/sections.h> -extern void __nosave_begin, __nosave_end; +extern long __nosave_begin, __nosave_end; extern long __machvec_start, __machvec_end; extern char __uncached_start, __uncached_end; extern char _ebss[]; |