summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-05-07 09:34:02 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-07 09:34:02 +0200
commit7b76415375ba91f5a06f8d5179278c03d6151d16 (patch)
tree11f156309efb05174906954efc5159a15b202437 /arch/arm/mach-mxs/include
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable (diff)
parentARM: zImage: make sure no GOTOFF relocs are used with .bss symbols (diff)
downloadlinux-7b76415375ba91f5a06f8d5179278c03d6151d16.tar.xz
linux-7b76415375ba91f5a06f8d5179278c03d6151d16.zip
Merge branch 'zImage_fixes' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-mxs/include')
-rw-r--r--arch/arm/mach-mxs/include/mach/uncompress.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/include/mach/uncompress.h b/arch/arm/mach-mxs/include/mach/uncompress.h
index f12a1732d8b8..7f8bf6539646 100644
--- a/arch/arm/mach-mxs/include/mach/uncompress.h
+++ b/arch/arm/mach-mxs/include/mach/uncompress.h
@@ -20,7 +20,7 @@
#include <asm/mach-types.h>
-static unsigned long mxs_duart_base;
+unsigned long mxs_duart_base;
#define MXS_DUART(x) (*(volatile unsigned long *)(mxs_duart_base + (x)))