hal: Branch 'master'

[Danny Kukawka]

 doc/spec/hal-spec-properties.xml |   24 ++++++++++++++++++++++++
 hald/linux/blockdev.c            |    3 +--
 2 files changed, 25 insertions(+), 2 deletions(-)

New commits:
commit e1870c10117fc491ff72852f38f8bd738ad3b9b1
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Mar 6 15:36:19 2008 +0100

    updated spec for existing storage.bus types
    
    Updated spec for existing storage.bus types (pcmcia,mmc,ccw,vio)

diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index afb638f..bdff36a 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -3999,6 +3999,30 @@ org.freedesktop.Hal.Device.Volume.method_signatures = {'ssas', 'as', 'as'}
             </row>
             <row>
               <entry></entry>
+              <entry>pcmcia</entry>
+              <entry></entry>
+              <entry>PCMCIA interface</entry>
+            </row>
+            <row>
+              <entry></entry>
+              <entry>mmc</entry>
+              <entry></entry>
+              <entry>MultiMediaCard (MMC) interface</entry>
+            </row>
+            <row>
+              <entry></entry>
+              <entry>ccw</entry>
+              <entry></entry>
+              <entry>IBM s390/s390x ccw interface</entry>
+            </row>
+            <row>
+              <entry></entry>
+              <entry>vio</entry>
+              <entry></entry>
+              <entry>IBM pSeries/iSeries Vio interface</entry>
+            </row>
+            <row>
+              <entry></entry>
               <entry>platform</entry>
               <entry></entry>
               <entry>Legacy device that is part of the platform</entry>
diff --git a/hald/linux/blockdev.c b/hald/linux/blockdev.c
index 8a4befa..846e7a9 100644
--- a/hald/linux/blockdev.c
+++ b/hald/linux/blockdev.c
@@ -1174,8 +1174,7 @@ hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_f
 					physdev = d_it;
 					physdev_udi = udi_it;
 					is_hotpluggable = TRUE;
-					hal_device_property_set_string
-						(d, "storage.bus", "ccw");
+					hal_device_property_set_string (d, "storage.bus", "ccw");
 				} else if (strcmp (bus, "vio") == 0) {
 					physdev = d_it;
 					physdev_udi = udi_it;