From 52b64143c544fc1de7efa32d100221adfdfa40f1 Mon Sep 17 00:00:00 2001 From: Agney Lopes Roth Ferraz Date: Mon, 11 Dec 2006 20:40:14 -0200 Subject: Import Debian changes 0.4.1-7 hardinfo (0.4.1-7) unstable; urgency=low * Fixed FTBFS on s390, ia64 and alpha. --- arch/linux/s390/processor.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'arch/linux/s390/processor.h') diff --git a/arch/linux/s390/processor.h b/arch/linux/s390/processor.h index 604b3514..1648b917 100644 --- a/arch/linux/s390/processor.h +++ b/arch/linux/s390/processor.h @@ -36,8 +36,8 @@ computer_get_processor(void) tmp[1] = g_strstrip(tmp[1]); get_str("vendor_id", processor->vendor_id); - get_float("# processors", processor->processors); - get_int("bogomips per cpu", processor->bogomips); + get_int("# processors", processor->model); + get_float("bogomips per cpu", processor->bogomips); } g_strfreev(tmp); @@ -55,12 +55,15 @@ static gchar * processor_get_info(Processor *processor) { return g_strdup_printf("[Processor]\n" - "Processors=%d\n" + "Name=%s\n" + "Vendor=%s\n" "BogoMips per CPU=%.2f" + "Processors=%d\n" "Byte Order=%s\n", processor->model_name, - processor->processors, + processor->vendor_id, processor->bogomips, + processor->model, #if G_BYTE_ORDER == G_LITTLE_ENDIAN "Little Endian" #else -- cgit v1.2.3