summaryrefslogtreecommitdiffstats
path: root/arch/mips/mips-boards/generic/display.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-12-21 22:21:08 +1100
committerPaul Mackerras <paulus@samba.org>2007-12-21 22:21:08 +1100
commitc2a7dcad9f0d92d7a96e735abb8bec7b9c621536 (patch)
treebf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9 /arch/mips/mips-boards/generic/display.c
parent373a6da165ac3012a74fd072da340eabca55d031 (diff)
parentea67db4cdbbf7f4e74150e71da0984e25121f500 (diff)
downloadblackbird-op-linux-c2a7dcad9f0d92d7a96e735abb8bec7b9c621536.tar.gz
blackbird-op-linux-c2a7dcad9f0d92d7a96e735abb8bec7b9c621536.zip
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/mips/mips-boards/generic/display.c')
-rw-r--r--arch/mips/mips-boards/generic/display.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/mips-boards/generic/display.c b/arch/mips/mips-boards/generic/display.c
index 5d600054090a..2a0057cfc30d 100644
--- a/arch/mips/mips-boards/generic/display.c
+++ b/arch/mips/mips-boards/generic/display.c
@@ -37,9 +37,9 @@ void mips_display_message(const char *str)
for (i = 0; i <= 14; i=i+2) {
if (*str)
- writel(*str++, display + i);
+ __raw_writel(*str++, display + i);
else
- writel(' ', display + i);
+ __raw_writel(' ', display + i);
}
}
OpenPOWER on IntegriCloud