Module Name: src
Committed By: mrg
Date: Tue Feb 16 00:13:14 UTC 2010
Modified Files:
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
don't call most/all Core2's "(Merom)".
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.20 src/usr.sbin/cpuctl/arch/i386.c:1.21
--- src/usr.sbin/cpuctl/arch/i386.c:1.20 Fri Oct 2 13:54:01 2009
+++ src/usr.sbin/cpuctl/arch/i386.c Tue Feb 16 00:13:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.20 2009/10/02 13:54:01 jmcneill Exp $ */
+/* $NetBSD: i386.c,v 1.21 2010/02/16 00:13:14 mrg Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.20 2009/10/02 13:54:01 jmcneill Exp $");
+__RCSID("$NetBSD: i386.c,v 1.21 2010/02/16 00:13:14 mrg Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -309,7 +309,7 @@
"Pentium III (Tualatin)", 0,
"Pentium M (Dothan)",
"Pentium M (Yonah)",
- "Core 2 (Merom)",
+ "Core 2",
"Pentium Pro, II or III" /* Default */
},
NULL,
