hal: Branch 'master'

[David Zeuthen]

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

New commits:
commit 9d85841633d4530677703b88b14cf7a2ee11bc7e
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Mar 3 17:08:46 2008 -0500

    fix build

diff --git a/hald/linux/device.c b/hald/linux/device.c
index 397ebc5..982e493 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -2319,7 +2319,7 @@ sdio_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_d
 	HalDevice *d;
 	const gchar *bus_id;
 	gchar buf[256];
-	gint host_num, rca, card_id, vendor_id, product_id;
+	gint host_num, rca, card_id;
 
 	if (parent_dev == NULL)
 		return NULL;
@@ -2354,7 +2354,7 @@ sdio_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_d
 }
 
 static gboolean
-sdio_card_compute_udi (HalDevice *d)
+sdio_compute_udi (HalDevice *d)
 {
 	gchar udi[256];