diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
| commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
| tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /arch/mips/mm/c-r4k.c | |
| parent | 3878fb6fdbceecca20b15748f807340854220f06 (diff) | |
| parent | 511e11e396dc596825ce04d53d7f6d579404bc01 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'arch/mips/mm/c-r4k.c')
| -rw-r--r-- | arch/mips/mm/c-r4k.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index 58d9075e86fe..171951d2305b 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c | |||
| @@ -1041,7 +1041,7 @@ static void __cpuinit probe_pcache(void) | |||
| 1041 | 1041 | ||
| 1042 | printk("Primary instruction cache %ldkB, %s, %s, linesize %d bytes.\n", | 1042 | printk("Primary instruction cache %ldkB, %s, %s, linesize %d bytes.\n", |
| 1043 | icache_size >> 10, | 1043 | icache_size >> 10, |
| 1044 | cpu_has_vtag_icache ? "VIVT" : "VIPT", | 1044 | c->icache.flags & MIPS_CACHE_VTAG ? "VIVT" : "VIPT", |
| 1045 | way_string[c->icache.ways], c->icache.linesz); | 1045 | way_string[c->icache.ways], c->icache.linesz); |
| 1046 | 1046 | ||
| 1047 | printk("Primary data cache %ldkB, %s, %s, %s, linesize %d bytes\n", | 1047 | printk("Primary data cache %ldkB, %s, %s, %s, linesize %d bytes\n", |