hal: Branch 'master'

[Martin Pitt]

 hald/linux/addons/addon-cpufreq.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a9f46961e8c1427edaa7c0f85e3d9e8169e2013c
Author: Michael Biebl <biebl at debian.org>
Date:   Wed Jul 29 09:20:41 2009 +0200

    fix a misleading warning in ondemand_set_consider_nice()
    
    It previously said "%u kHz", but %u is a boolean, thus kHz does not make sense.
    Remove the "kHz".
    
    http://bugs.debian.org/532999

diff --git a/hald/linux/addons/addon-cpufreq.c b/hald/linux/addons/addon-cpufreq.c
index f8d29ab..977ee08 100644
--- a/hald/linux/addons/addon-cpufreq.c
+++ b/hald/linux/addons/addon-cpufreq.c
@@ -408,7 +408,7 @@ static gboolean ondemand_set_consider_nice(void *data, gboolean consider)
 	consider_file = g_strdup_printf(ONDEMAND_IGNORE_NICE_LOAD_FILE, iface->base_cpu); 
 
         if(!write_line(consider_file, "%u", !consider)){
-                HAL_WARNING(("Could not set ignore_nice_load to: %u kHz; %s", consider,
+                HAL_WARNING(("Could not set ignore_nice_load to: %u; %s", consider,
 			     strerror(errno)));
 		g_free(consider_file);
                 return FALSE;