hal: Branch 'master' - 2 commits

[Rob Taylor]

 hald/linux/osspec.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 545e159e105bfaf8c0ea155e2d939f3eb1858806 (from parents)
Merge: 59a471c033ec2d3e5bb07387c3c31cea50ea5712 5b439b8e9724b069e21598846d55ae3bccebcc2e
Author: Rob Taylor <rob.taylor at codethink.co.uk>
Date:   Tue Feb 6 03:07:24 2007 +0000

    Merge branch 'master' of ssh://git.freedesktop.org/git/hal

diff-tree 59a471c033ec2d3e5bb07387c3c31cea50ea5712 (from 1a0857154bf60a03b355daa9cc8d7127db69a267)
Author: Rob Taylor <rob.taylor at codethink.co.uk>
Date:   Mon Feb 5 11:08:02 2007 +0000

    Fix compile warning on PPC.
    
    Fixes compile warning introduced on PPC with the introduction of hald_runner_set_method_run_notify.

diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
index 1fdf90a..7a8409f 100644
--- a/hald/linux/osspec.c
+++ b/hald/linux/osspec.c
@@ -576,8 +576,8 @@ osspec_probe (void)
 
 	should_decode_dmi = FALSE;
 
-	hald_runner_set_method_run_notify (hotplug_event_process_queue,
-					   NULL);
+	hald_runner_set_method_run_notify
+          ((HaldRunnerRunNotify*) hotplug_event_process_queue, NULL);
 	root = hal_device_new ();
 	hal_device_property_set_string (root, "info.bus", "unknown");
 	hal_device_property_set_string (root, "info.product", "Computer");