hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-card-readers.fdi |   31 ++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

New commits:
commit 37243b5a7cfb77b22498376ab2c81fec277a6d7c
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Aug 25 20:26:57 2008 +0200

    cleanup 10-usb-card-readers.fdi
    
    Cleaned up 10-usb-card-readers.fdi, put entries of the same vendor
    together.

diff --git a/fdi/information/10freedesktop/10-usb-card-readers.fdi b/fdi/information/10freedesktop/10-usb-card-readers.fdi
index 789c528..80a34aa 100644
--- a/fdi/information/10freedesktop/10-usb-card-readers.fdi
+++ b/fdi/information/10freedesktop/10-usb-card-readers.fdi
@@ -110,19 +110,19 @@
 
       <!-- Noname multi-card Readers (vendor: Genesys Logic) -->
       <match key="@storage.originating_device:usb.vendor_id" int="0x05e3">
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x070e;0x0760;0x927">
-	     <match key="storage.lun" int="0">
-		     <merge key="storage.drive_type" type="string">compact_flash</merge>
-	     </match>
-	     <match key="storage.lun" int="1">
-		     <merge key="storage.drive_type" type="string">smart_media</merge>
-	     </match>
-	     <match key="storage.lun" int="2">
-		     <merge key="storage.drive_type" type="string">sd_mmc</merge>
-	     </match>
-	     <match key="storage.lun" int="3">
-		     <merge key="storage.drive_type" type="string">memory_stick</merge>
-	     </match>
+	<match key="@storage.originating_device:usb.product_id" int_outof="0x070e;0x0760;0x927">
+	  <match key="storage.lun" int="0">
+	    <merge key="storage.drive_type" type="string">compact_flash</merge>
+	  </match>
+	  <match key="storage.lun" int="1">
+	    <merge key="storage.drive_type" type="string">smart_media</merge>
+	  </match>
+	  <match key="storage.lun" int="2">
+	    <merge key="storage.drive_type" type="string">sd_mmc</merge>
+	  </match>
+	  <match key="storage.lun" int="3">
+	    <merge key="storage.drive_type" type="string">memory_stick</merge>
+	  </match>
         </match>
       </match>
 
@@ -138,10 +138,7 @@
         <match key="@storage.originating_device:usb.product_id" int="0x0002">
           <merge key="storage.drive_type" type="string">compact_flash</merge>
         </match>
-      </match>
-
-      <!-- SanDisk ImageMate 12 in 1 Reader -->
-      <match key="@storage.originating_device:usb.vendor_id" int="0x0781">
+        <!-- SanDisk ImageMate 12 in 1 Reader -->
 	<match key="@storage.originating_device:usb.product_id" int="0xb4b5">
 	  <match key="storage.lun" int="0">
 	    <merge key="storage.drive_type" type="string">compact_flash</merge>