diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 14:28:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 14:28:04 -0400 |
| commit | 9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0 (patch) | |
| tree | 894bb6a3fb409c6ac5f0374f5a1f656918bc35cd /arch/arm/mach-w90x900 | |
| parent | ec19628d72cff8f80220b7cedba089074ac6a599 (diff) | |
| parent | dc7ad3b3d5f1cd0a0d16c05dd3ad3898979d261e (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mach-ns9xxx/include/mach/uncompress.h
Diffstat (limited to 'arch/arm/mach-w90x900')
| -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 56f1a74d7016..03130212ace2 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 | { |