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/mach-w90x900/include/mach/uncompress.h | |
| 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/mach-w90x900/include/mach/uncompress.h')
| -rw-r--r-- | arch/arm/mach-w90x900/include/mach/uncompress.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-w90x900/include/mach/uncompress.h b/arch/arm/mach-w90x900/include/mach/uncompress.h index 56f1a74d701..03130212ace 100644 --- a/arch/arm/mach-w90x900/include/mach/uncompress.h +++ b/arch/arm/mach-w90x900/include/mach/uncompress.h | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #define arch_decomp_wdog() | 27 | #define arch_decomp_wdog() |
| 28 | 28 | ||
| 29 | #define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE) | 29 | #define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE) |
| 30 | static volatile u32 * uart_base = (u32 *)UART0_PA; | 30 | static volatile u32 * const uart_base = (u32 *)UART0_PA; |
| 31 | 31 | ||
| 32 | static void putc(int ch) | 32 | static void putc(int ch) |
| 33 | { | 33 | { |