diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-07 09:34:02 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-07 09:34:02 +0200 |
| commit | 7b76415375ba91f5a06f8d5179278c03d6151d16 (patch) | |
| tree | 11f156309efb05174906954efc5159a15b202437 /arch/arm/mach-pxa/include | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable (diff) | |
| parent | ARM: zImage: make sure no GOTOFF relocs are used with .bss symbols (diff) | |
| download | linux-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-pxa/include')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/uncompress.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/include/mach/uncompress.h b/arch/arm/mach-pxa/include/mach/uncompress.h index 759b851ec985..5519a34b667f 100644 --- a/arch/arm/mach-pxa/include/mach/uncompress.h +++ b/arch/arm/mach-pxa/include/mach/uncompress.h @@ -16,9 +16,9 @@ #define BTUART_BASE (0x40200000) #define STUART_BASE (0x40700000) -static unsigned long uart_base; -static unsigned int uart_shift; -static unsigned int uart_is_pxa; +unsigned long uart_base; +unsigned int uart_shift; +unsigned int uart_is_pxa; static inline unsigned char uart_read(int offset) { |