diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2015-02-19 10:00:34 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-02-19 10:00:34 -0500 |
| commit | 661af35e5fd878f915ed05dbbfe383f64133f98c (patch) | |
| tree | 956b7efd662b682224e61060552fdcf4201101bf /arch/mips/kernel/spram.c | |
| parent | ca5d25642e212f73492d332d95dc90ef46a0e8dc (diff) | |
| parent | f296e7c48d3155991b99f41372e1786c5be03457 (diff) | |
Merge branch 'mipsr6-for-3.20' of git://git.linux-mips.org/pub/scm/mchandras/linux into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel/spram.c')
| -rw-r--r-- | arch/mips/kernel/spram.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/spram.c b/arch/mips/kernel/spram.c index 67f2495def1c..d1168d7c31e8 100644 --- a/arch/mips/kernel/spram.c +++ b/arch/mips/kernel/spram.c | |||
| @@ -208,6 +208,7 @@ void spram_config(void) | |||
| 208 | case CPU_INTERAPTIV: | 208 | case CPU_INTERAPTIV: |
| 209 | case CPU_PROAPTIV: | 209 | case CPU_PROAPTIV: |
| 210 | case CPU_P5600: | 210 | case CPU_P5600: |
| 211 | case CPU_QEMU_GENERIC: | ||
| 211 | config0 = read_c0_config(); | 212 | config0 = read_c0_config(); |
| 212 | /* FIXME: addresses are Malta specific */ | 213 | /* FIXME: addresses are Malta specific */ |
| 213 | if (config0 & (1<<24)) { | 214 | if (config0 & (1<<24)) { |