summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shark/include/mach/uncompress.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-05-08 18:29:27 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-05-08 18:29:27 -0700
commitd585a021c0b10b0477d6b608c53e1feb8cde0507 (patch)
tree5ca059da1db7f15d4b29427644ad9c08270c885c /arch/arm/mach-shark/include/mach/uncompress.h
parent84e5b0d00f8f84c4ae226be131d4bebbcee88bd3 (diff)
parent091bf7624d1c90cec9e578a18529f615213ff847 (diff)
downloadblackbird-op-linux-d585a021c0b10b0477d6b608c53e1feb8cde0507.tar.gz
blackbird-op-linux-d585a021c0b10b0477d6b608c53e1feb8cde0507.zip
Merge commit 'v2.6.30-rc5' into next
Diffstat (limited to 'arch/arm/mach-shark/include/mach/uncompress.h')
-rw-r--r--arch/arm/mach-shark/include/mach/uncompress.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shark/include/mach/uncompress.h b/arch/arm/mach-shark/include/mach/uncompress.h
index 3725e1633418..22ccab4c3c5e 100644
--- a/arch/arm/mach-shark/include/mach/uncompress.h
+++ b/arch/arm/mach-shark/include/mach/uncompress.h
@@ -11,7 +11,7 @@
static inline void putc(int c)
{
- int t;
+ volatile int t;
SERIAL_BASE[0] = c;
t=0x10000;
OpenPOWER on IntegriCloud