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-davinci/include | |
| 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-davinci/include')
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/uncompress.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/include/mach/uncompress.h b/arch/arm/mach-davinci/include/mach/uncompress.h index 47723e8d75a4..78d80683cdc2 100644 --- a/arch/arm/mach-davinci/include/mach/uncompress.h +++ b/arch/arm/mach-davinci/include/mach/uncompress.h | |||
| @@ -25,8 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | #include <mach/serial.h> | 26 | #include <mach/serial.h> |
| 27 | 27 | ||
| 28 | static u32 *uart; | 28 | u32 *uart; |
| 29 | static u32 *uart_info = (u32 *)(DAVINCI_UART_INFO); | ||
| 30 | 29 | ||
| 31 | /* PORT_16C550A, in polled non-fifo mode */ | 30 | /* PORT_16C550A, in polled non-fifo mode */ |
| 32 | static void putc(char c) | 31 | static void putc(char c) |
| @@ -44,6 +43,8 @@ static inline void flush(void) | |||
| 44 | 43 | ||
| 45 | static inline void set_uart_info(u32 phys, void * __iomem virt) | 44 | static inline void set_uart_info(u32 phys, void * __iomem virt) |
| 46 | { | 45 | { |
| 46 | u32 *uart_info = (u32 *)(DAVINCI_UART_INFO); | ||
| 47 | |||
| 47 | uart = (u32 *)phys; | 48 | uart = (u32 *)phys; |
| 48 | uart_info[0] = phys; | 49 | uart_info[0] = phys; |
| 49 | uart_info[1] = (u32)virt; | 50 | uart_info[1] = (u32)virt; |