diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-28 20:27:11 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-28 20:27:11 -0500 |
| commit | ef8d2f45c6dde22cef2eb38cb0e05edcd171a034 (patch) | |
| tree | 99fb6fce60f224d98b0296e1557b35f3b95187da | |
| parent | 4195bdbea42151c04485b0d131eed6dd97309cee (diff) | |
| parent | 177b2927e2eea73c598a218680b4dc9043c51dcb (diff) | |
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) | |||
| 159 | BONITO_PCIMEMBASECFG |= | 159 | BONITO_PCIMEMBASECFG |= |
| 160 | (BONITO_PCIMEMBASECFG_MEMBASE0_CACHED | | 160 | (BONITO_PCIMEMBASECFG_MEMBASE0_CACHED | |
| 161 | BONITO_PCIMEMBASECFG_MEMBASE1_CACHED); | 161 | BONITO_PCIMEMBASECFG_MEMBASE1_CACHED); |
| 162 | printk("Disabled Bonito IOBC coherency\n"); | 162 | printk("Enabled Bonito IOBC coherency\n"); |
| 163 | } | 163 | } |
| 164 | } | 164 | } |
| 165 | else | 165 | else |