From e07ad3711f92f52f2ec315712a6360f62475b007 Mon Sep 17 00:00:00 2001 From: Agney Lopes Roth Ferraz Date: Fri, 13 Oct 2006 13:24:15 -0300 Subject: Import Debian changes 0.4.1-4 hardinfo (0.4.1-4) unstable; urgency=low * Fixed FTBFS on alphaand ia64. --- arch/linux/alpha/processor.h | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'arch/linux/alpha') diff --git a/arch/linux/alpha/processor.h b/arch/linux/alpha/processor.h index ef73c922..88f58589 100644 --- a/arch/linux/alpha/processor.h +++ b/arch/linux/alpha/processor.h @@ -35,20 +35,15 @@ 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->model_name); - get_int("page size [bytes]", processor->page_size); - get_int("cycle frequency [Hz]", processor->cycle_frequency); - get_int("timer frequency [Hz]", processor->timer_frequency); get_float("BogoMIPS", processor->bogomips); - get_float("platform string", processor->plataform); + get_str("platform string", processor->strmodel); } g_strfreev(tmp); } - gchar *tmp = g_strconcat(processor->model, processor->model_name, NULL); - g_free(processor->model); + gchar *tmp = g_strconcat("Alpha", processor->model_name, NULL); g_free(processor->model_name); processor->model_name = tmp; @@ -60,18 +55,12 @@ computer_get_processor(void) static gchar * processor_get_info(Processor *processor) { - return g_strdup_printf("[Processor]\n" - "Page Size=%s\n" + return g_strdup_printf("[Processor] %s\n" "Plataform String=%s\n" - "Cycle Frequency=%.2fMHz\n" - "Timer Frequency=%.2fMHz\n" "BogoMips=%.2f" "Byte Order=%s\n", processor->model_name, - processor->page_size, processor->plataform, - processor->cycle_frequency, - processor->timer_frequency, processor->bogomips, #if G_BYTE_ORDER == G_LITTLE_ENDIAN "Little Endian" -- cgit v1.2.3