diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-30 21:11:18 +0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-30 21:11:18 +0400 |
commit | f004eaf4d17d205842424a7e95dcff9a46fe3c5f (patch) | |
tree | fbf213d7b933b4f58b031269a2a31b275c95be6c /arch/mips/sni | |
parent | abf92a3d2e868fef808d4a205371b7e5417dd0f7 (diff) | |
parent | 937433c2502f663e5a0e8804462bc38c41b9021f (diff) | |
download | linux-f004eaf4d17d205842424a7e95dcff9a46fe3c5f.tar.xz |
Merge remote-tracking branch 'regulator/topic/da9210' into regulator-devm
Diffstat (limited to 'arch/mips/sni')
-rw-r--r-- | arch/mips/sni/setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c index 5b09b3544edd..efad85c8c823 100644 --- a/arch/mips/sni/setup.c +++ b/arch/mips/sni/setup.c @@ -25,6 +25,7 @@ #endif #include <asm/bootinfo.h> +#include <asm/cpu.h> #include <asm/io.h> #include <asm/reboot.h> #include <asm/sni.h> @@ -173,7 +174,7 @@ void __init plat_mem_setup(void) system_type = "RM300-Cxx"; break; case SNI_BRD_PCI_DESKTOP: - switch (read_c0_prid() & 0xff00) { + switch (read_c0_prid() & PRID_IMP_MASK) { case PRID_IMP_R4600: case PRID_IMP_R4700: system_type = "RM200-C20"; |