| commit | 8dc6d8a5edacd37fb4a141ec5875d73a47c7e491 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Tue Jan 08 23:32:29 2013 -0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Tue Jan 08 23:32:26 2013 -0800 |
| tree | ef219fa0143f7d9f727a517100bbbb7dfd686b35 | |
| parent | 4e282500707d2e470df5bda2db378f50e4f9dd33 [diff] | |
| parent | bdff7fe6b567c163349ed57e0b33b340d86f1e49 [diff] |
Merge "msm: socinfo: Add MIDR value for MSM8974 v1.2's Krait CPU"
diff --git a/arch/arm/mach-msm/socinfo.c b/arch/arm/mach-msm/socinfo.c index 47d311c..1ab1f71 100644 --- a/arch/arm/mach-msm/socinfo.c +++ b/arch/arm/mach-msm/socinfo.c
@@ -1141,6 +1141,7 @@ return MSM_CPU_8064; case 0x511F06F1: + case 0x511F06F2: case 0x512F06F0: return MSM_CPU_8974; @@ -1192,6 +1193,7 @@ case 0x512F04D0: case 0x511F06F0: case 0x511F06F1: + case 0x511F06F2: case 0x510F05D0: return 1;