diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-07 03:34:02 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-07 03:34:02 -0400 |
| commit | 7b76415375ba91f5a06f8d5179278c03d6151d16 (patch) | |
| tree | 11f156309efb05174906954efc5159a15b202437 /arch/arm/plat-mxc/include | |
| parent | c93212f387fdf5180d9d13cc207419abd5b3ec17 (diff) | |
| parent | 8d7e4cc2c8ea1d180d32d902eb899f27d3ee53d7 (diff) | |
Merge branch 'zImage_fixes' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/plat-mxc/include')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/uncompress.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/uncompress.h b/arch/arm/plat-mxc/include/mach/uncompress.h index 4864b0afd440..d85e2d1c0324 100644 --- a/arch/arm/plat-mxc/include/mach/uncompress.h +++ b/arch/arm/plat-mxc/include/mach/uncompress.h | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | #include <asm/mach-types.h> | 22 | #include <asm/mach-types.h> |
| 23 | 23 | ||
| 24 | static unsigned long uart_base; | 24 | unsigned long uart_base; |
| 25 | 25 | ||
| 26 | #define UART(x) (*(volatile unsigned long *)(uart_base + (x))) | 26 | #define UART(x) (*(volatile unsigned long *)(uart_base + (x))) |
| 27 | 27 | ||