hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-card-readers.fdi |   22 +-----------------
 1 file changed, 2 insertions(+), 20 deletions(-)

New commits:
commit d4a58e9814dcf64e409da7883cd9324cdfabb952
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Mar 19 12:09:03 2008 +0100

    added a multi-card Reader from Genesys Logic
    
    Added a multi-card Reader from Genesys Logic and merged all
    existing entries from this vendor to one match.

diff --git a/fdi/information/10freedesktop/10-usb-card-readers.fdi b/fdi/information/10freedesktop/10-usb-card-readers.fdi
index 6c39588..d7bf3c3 100644
--- a/fdi/information/10freedesktop/10-usb-card-readers.fdi
+++ b/fdi/information/10freedesktop/10-usb-card-readers.fdi
@@ -89,29 +89,11 @@
       </match>
       <match key="storage.model" string="IC1210    MMC/SD">
         <merge key="storage.drive_type" type="string">sd_mmc</merge>
-</match>
-
-      <!-- Noname multi-card Reader -->
-      <match key="@storage.originating_device:usb.vendor_id" int="0x05e3">
-	  <match key="@storage.originating_device:usb.product_id" int="0x0760">
-	     <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>
 
-      <!-- Another noname multi-card Reader -->
+      <!-- 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="0x070e">
+	  <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>