From 7d05cf36fc9b528bc03424d5778ca92d74d39465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Mon, 19 Oct 2009 00:07:59 +0000 Subject: [PATCH] Revert my additions to the patch from #4733, Core 2, Core 2 Duo and Core 2 Quad are all reported as "Core 2", because the CPU count is already reported separately. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33646 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/shared/cpu_type.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/headers/private/shared/cpu_type.h b/headers/private/shared/cpu_type.h index 6ff227d7d4..a303676ad1 100644 --- a/headers/private/shared/cpu_type.h +++ b/headers/private/shared/cpu_type.h @@ -191,10 +191,9 @@ get_cpu_model_string(system_info *info) get_cpuid_model_string(cpuidName); if (strcasestr(cpuidName, "Celeron") != NULL) return "Core 2 Celeron"; - if (strcasestr(cpuidName, "Duo") != NULL) - return "Core 2 Duo"; - if (strcasestr(cpuidName, "Quad") != NULL) - return "Core 2 Quad"; + if (strcasestr(cpuidName, "Duo") != NULL + || strcasestr(cpuidName, "Quad") != NULL) + return "Core 2"; if (strcasestr(cpuidName, "Xeon") != NULL) return "Core 2 Xeon"; return "Core 2 Extreme";