diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-07 08:34:02 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-07 08:34:02 +0100 |
| commit | 7b76415375ba91f5a06f8d5179278c03d6151d16 (patch) | |
| tree | 11f156309efb05174906954efc5159a15b202437 /arch/arm/mach-mxs | |
| parent | c93212f387fdf5180d9d13cc207419abd5b3ec17 (diff) | |
| parent | 8d7e4cc2c8ea1d180d32d902eb899f27d3ee53d7 (diff) | |
| download | linux-7b76415375ba91f5a06f8d5179278c03d6151d16.tar.gz linux-7b76415375ba91f5a06f8d5179278c03d6151d16.tar.bz2 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')
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/uncompress.h | 2 |
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))) |