Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

ef8d2f45 · Linus Torvalds <[email protected]> · 2006-11-28 17:27:11 -08:00

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix Bonito bootup message.

Merge commit. Changes below are compared with the first parent: 4195bdbe.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
arch/mips/mips-boards/malta/malta_setup.c	modified	+1	−1	View file

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