diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-29 02:27:11 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-29 02:27:11 +0100 |
| commit | ef8d2f45c6dde22cef2eb38cb0e05edcd171a034 (patch) | |
| tree | 99fb6fce60f224d98b0296e1557b35f3b95187da | |
| parent | [PATCH] add missing libsas include to fix s390 compilation. (diff) | |
| parent | [MIPS] Fix Bonito bootup message. (diff) | |
| download | linux-ef8d2f45c6dde22cef2eb38cb0e05edcd171a034.tar.xz linux-ef8d2f45c6dde22cef2eb38cb0e05edcd171a034.zip | |
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.c | 2 |
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 ab460f805bef..282f3e52eea3 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 |