summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-11-28 17:27:11 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-28 17:27:11 -0800
commitef8d2f45c6dde22cef2eb38cb0e05edcd171a034 (patch)
tree99fb6fce60f224d98b0296e1557b35f3b95187da
parent4195bdbea42151c04485b0d131eed6dd97309cee (diff)
parent177b2927e2eea73c598a218680b4dc9043c51dcb (diff)
downloadop-kernel-dev-ef8d2f45c6dde22cef2eb38cb0e05edcd171a034.zip
op-kernel-dev-ef8d2f45c6dde22cef2eb38cb0e05edcd171a034.tar.gz
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Fix Bonito bootup message.
-rw-r--r--arch/mips/mips-boards/malta/malta_setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c
index ab460f8..282f3e5 100644
--- a/arch/mips/mips-boards/malta/malta_setup.c
+++ b/arch/mips/mips-boards/malta/malta_setup.c
@@ -159,7 +159,7 @@ void __init plat_mem_setup(void)
BONITO_PCIMEMBASECFG |=
(BONITO_PCIMEMBASECFG_MEMBASE0_CACHED |
BONITO_PCIMEMBASECFG_MEMBASE1_CACHED);
- printk("Disabled Bonito IOBC coherency\n");
+ printk("Enabled Bonito IOBC coherency\n");
}
}
else
OpenPOWER on IntegriCloud