summaryrefslogtreecommitdiffstats
path: root/arch/sh/include/asm/sections.h
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-03-12 09:25:53 +0100
committerGrant Likely <grant.likely@secretlab.ca>2011-03-12 09:25:53 +0100
commit9c3c8afccb6a163fd2be739f511e863eab668702 (patch)
treee587a5377ada98fed8cfa6c8ee63125361f2818a /arch/sh/include/asm/sections.h
parentof_mmc_spi: add card detect irq support (diff)
parentLinux 2.6.38-rc8 (diff)
downloadlinux-9c3c8afccb6a163fd2be739f511e863eab668702.tar.xz
linux-9c3c8afccb6a163fd2be739f511e863eab668702.zip
Merge commit 'v2.6.38-rc8' into spi/next
Conflicts: drivers/spi/pxa2xx_spi_pci.c
Diffstat (limited to 'arch/sh/include/asm/sections.h')
-rw-r--r--arch/sh/include/asm/sections.h2
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[];