git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
include
/
mach
/
uncompress.h
diff --git
a/arch/arm/mach-davinci/include/mach/uncompress.h
b/arch/arm/mach-davinci/include/mach/uncompress.h
index
47723e8
..
78d8068
100644
(file)
--- a/
arch/arm/mach-davinci/include/mach/uncompress.h
+++ b/
arch/arm/mach-davinci/include/mach/uncompress.h
@@
-25,8
+25,7
@@
#include <mach/serial.h>
#include <mach/serial.h>
-static u32 *uart;
-static u32 *uart_info = (u32 *)(DAVINCI_UART_INFO);
+u32 *uart;
/* PORT_16C550A, in polled non-fifo mode */
static void putc(char c)
/* PORT_16C550A, in polled non-fifo mode */
static void putc(char c)
@@
-44,6
+43,8
@@
static inline void flush(void)
static inline void set_uart_info(u32 phys, void * __iomem virt)
{
static inline void set_uart_info(u32 phys, void * __iomem virt)
{
+ u32 *uart_info = (u32 *)(DAVINCI_UART_INFO);
+
uart = (u32 *)phys;
uart_info[0] = phys;
uart_info[1] = (u32)virt;
uart = (u32 *)phys;
uart_info[0] = phys;
uart_info[1] = (u32)virt;