diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-05-06 17:38:00 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-05-06 17:38:00 -0400 |
| commit | 4183bef2e093a2f0aab45f2d5fed82b0e02aeacf (patch) | |
| tree | e84c484db3746a0f3ead0fb7a2bb9e5a42b89e85 /arch/mips/kernel/proc.c | |
| parent | 662478d060a39b8faf2b1fe2fbbb212556c2e052 (diff) | |
| parent | 775c4f66fd855e68a98fc5049003810fe98e2e20 (diff) | |
Merge branch 'late/dt' into next/dt2
This is support for the ARM Chromebook, originally scheduled
as a "late" pull request. Since it's already late now, we
can combine this into the existing next/dt2 branch.
* late/dt:
ARM: exynos: dts: cros5250: add EC device
ARM: dts: Add sbs-battery for exynos5250-snow
ARM: dts: Add i2c-arbitrator bus for exynos5250-snow
ARM: dts: Add chip-id controller node on Exynos4/5 SoC
ARM: EXYNOS: Create virtual I/O mapping for Chip-ID controller using device tree
Diffstat (limited to 'arch/mips/kernel/proc.c')
| -rw-r--r-- | arch/mips/kernel/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c index 135c4aadccbe..7a54f74b7818 100644 --- a/arch/mips/kernel/proc.c +++ b/arch/mips/kernel/proc.c | |||
| @@ -67,7 +67,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 67 | if (cpu_has_mips_r) { | 67 | if (cpu_has_mips_r) { |
| 68 | seq_printf(m, "isa\t\t\t:"); | 68 | seq_printf(m, "isa\t\t\t:"); |
| 69 | if (cpu_has_mips_1) | 69 | if (cpu_has_mips_1) |
| 70 | seq_printf(m, "%s", "mips1"); | 70 | seq_printf(m, "%s", " mips1"); |
| 71 | if (cpu_has_mips_2) | 71 | if (cpu_has_mips_2) |
| 72 | seq_printf(m, "%s", " mips2"); | 72 | seq_printf(m, "%s", " mips2"); |
| 73 | if (cpu_has_mips_3) | 73 | if (cpu_has_mips_3) |