diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-01 12:02:17 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-01 12:02:17 -0500 |
| commit | 3af4182cc5be7d5505f9801ee3297373f1872446 (patch) | |
| tree | 214348d40ed547a72f9612a7e5c94a01afded812 /arch/mips/lib/dump_tlb.c | |
| parent | f5d4c67e41a262f0cdfaec1bb0fa8e5952187ef9 (diff) | |
| parent | c07f62e5f18123103459ff74e86af1518a5b8af5 (diff) | |
Merge branch 'upstream' into topic/asoc
Diffstat (limited to 'arch/mips/lib/dump_tlb.c')
| -rw-r--r-- | arch/mips/lib/dump_tlb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/lib/dump_tlb.c b/arch/mips/lib/dump_tlb.c index 465ff0ec85b9..779821cd54ab 100644 --- a/arch/mips/lib/dump_tlb.c +++ b/arch/mips/lib/dump_tlb.c | |||
| @@ -25,6 +25,7 @@ static inline const char *msk2str(unsigned int mask) | |||
| 25 | case PM_16M: return "16Mb"; | 25 | case PM_16M: return "16Mb"; |
| 26 | case PM_64M: return "64Mb"; | 26 | case PM_64M: return "64Mb"; |
| 27 | case PM_256M: return "256Mb"; | 27 | case PM_256M: return "256Mb"; |
| 28 | case PM_1G: return "1Gb"; | ||
| 28 | #endif | 29 | #endif |
| 29 | } | 30 | } |
| 30 | return ""; | 31 | return ""; |