diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-07 07:34:02 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-07 07:34:02 (GMT) |
commit | 7b76415375ba91f5a06f8d5179278c03d6151d16 (patch) | |
tree | 11f156309efb05174906954efc5159a15b202437 /arch/arm/mach-mmp | |
parent | c93212f387fdf5180d9d13cc207419abd5b3ec17 (diff) | |
parent | 8d7e4cc2c8ea1d180d32d902eb899f27d3ee53d7 (diff) | |
download | linux-fsl-qoriq-7b76415375ba91f5a06f8d5179278c03d6151d16.tar.xz |
Merge branch 'zImage_fixes' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-mmp')
-rw-r--r-- | arch/arm/mach-mmp/include/mach/uncompress.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/include/mach/uncompress.h b/arch/arm/mach-mmp/include/mach/uncompress.h index 85bd8a2..d6daeb7 100644 --- a/arch/arm/mach-mmp/include/mach/uncompress.h +++ b/arch/arm/mach-mmp/include/mach/uncompress.h @@ -14,7 +14,7 @@ #define UART2_BASE (APB_PHYS_BASE + 0x17000) #define UART3_BASE (APB_PHYS_BASE + 0x18000) -static volatile unsigned long *UART; +volatile unsigned long *UART; static inline void putc(char c) { |