hal: Branch 'master'

[Danny Kukawka]

 hald/linux/blockdev.c |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit afa1c7485690138642793613d068be9433f5896b
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Aug 11 12:13:50 2008 +0200

    remove storage.model property from volumes
    
    Remove storage.model property from volumes. This property make no
    sense on a volume device and should be used only within the storage
    namespace.

diff --git a/hald/linux/blockdev.c b/hald/linux/blockdev.c
index 369035d..396dd9e 100644
--- a/hald/linux/blockdev.c
+++ b/hald/linux/blockdev.c
@@ -1403,7 +1403,6 @@ hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_f
 		hal_device_property_set_string (d, "block.storage_device", hal_device_get_udi (parent));
 
 		/* defaults */
-		hal_device_property_set_string (d, "storage.model", "");
 		hal_device_property_set_string (d, "volume.fstype", "");
 		hal_device_property_set_string (d, "volume.fsusage", "");
 		hal_device_property_set_string (d, "volume.fsversion", "");