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 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
arm
/
mach-msm
/
include
/
mach
/
uncompress.h
diff --git
a/arch/arm/mach-msm/include/mach/uncompress.h
b/arch/arm/mach-msm/include/mach/uncompress.h
index
026e895
..
d94292c
100644
(file)
--- a/
arch/arm/mach-msm/include/mach/uncompress.h
+++ b/
arch/arm/mach-msm/include/mach/uncompress.h
@@
-16,9
+16,16
@@
#ifndef __ASM_ARCH_MSM_UNCOMPRESS_H
#include "hardware.h"
#ifndef __ASM_ARCH_MSM_UNCOMPRESS_H
#include "hardware.h"
+#include "linux/io.h"
+#include "mach/msm_iomap.h"
static void putc(int c)
{
static void putc(int c)
{
+#if defined(MSM_DEBUG_UART_PHYS)
+ unsigned base = MSM_DEBUG_UART_PHYS;
+ while (!(readl(base + 0x08) & 0x04)) ;
+ writel(c, base + 0x0c);
+#endif
}
static inline void flush(void)
}
static inline void flush(void)