git.samba.org
/
sfrench
/
cifs-2.6.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
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ixp4xx
/
include
/
mach
/
uncompress.h
diff --git
a/arch/arm/mach-ixp4xx/include/mach/uncompress.h
b/arch/arm/mach-ixp4xx/include/mach/uncompress.h
index 2db0078a8cf24d8284bb876ae4c14c8b35a41dde..219d7c1dcdba03f39ad3716c1b36c52b67352817 100644
(file)
--- a/
arch/arm/mach-ixp4xx/include/mach/uncompress.h
+++ b/
arch/arm/mach-ixp4xx/include/mach/uncompress.h
@@
-19,7
+19,7
@@
#define TX_DONE (UART_LSR_TEMT|UART_LSR_THRE)
-
static
volatile u32* uart_base;
+volatile u32* uart_base;
static inline void putc(int c)
{