From 2b76ad81f894cfcbdc897eb33a6e92ae74f81162 Mon Sep 17 00:00:00 2001 From: Agney Lopes Roth Ferraz Date: Tue, 12 Dec 2006 09:30:53 -0300 Subject: Import Debian changes 0.4.1-8 hardinfo (0.4.1-8) unstable; urgency=low * Fixed errors on processor.h on ia64 and alpha. --- arch/linux/alpha/processor.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'arch/linux/alpha') diff --git a/arch/linux/alpha/processor.h b/arch/linux/alpha/processor.h index 9a8a08ea..8b5826de 100644 --- a/arch/linux/alpha/processor.h +++ b/arch/linux/alpha/processor.h @@ -35,17 +35,16 @@ computer_get_processor(void) tmp[0] = g_strstrip(tmp[0]); tmp[1] = g_strstrip(tmp[1]); - get_str("cpu", processor->model); - get_str("cpu model", processor-vendor_id); - get_srt("system type", processor->flags); + get_str("cpu", processor->flags); + get_str("cpu model", processor->vendor_id); + get_str("system type", processor->flags); get_str("system variation", processor->has_fpu); get_float("BogoMIPS", processor->bogomips); } g_strfreev(tmp); } - gchar *tmp = g_strconcat(processor->model, processor->vendor_id, NULL); - g_free(processor->model); + gchar *tmp = g_strconcat(processor->flags, processor->vendor_id, NULL); g_free(processor->model_name); processor->model_name = tmp; @@ -66,7 +65,7 @@ processor_get_info(Processor *processor) "BogoMips=%.2f" "Byte Order=%s\n", processor->model_name, - processor->model, + processor->flags, processor->vendor_id, processor->flags, processor->has_fpu, -- cgit v1.2.3