hal: Branch 'master'

[David Zeuthen]

 fdi/information/10freedesktop/10-usb-card-readers.fdi |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

New commits:
commit 97c88b248b71875c1e390851d662fcdf05736bf5
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Dec 3 15:56:15 2007 -0500

    add another no-name card reader

diff --git a/fdi/information/10freedesktop/10-usb-card-readers.fdi b/fdi/information/10freedesktop/10-usb-card-readers.fdi
index 243317a..6c39588 100644
--- a/fdi/information/10freedesktop/10-usb-card-readers.fdi
+++ b/fdi/information/10freedesktop/10-usb-card-readers.fdi
@@ -109,6 +109,24 @@
         </match>
       </match>
 
+      <!-- Another noname multi-card Reader -->
+      <match key="@storage.originating_device:usb.vendor_id" int="0x05e3">
+	<match key="@storage.originating_device:usb.product_id" int="0x070e">
+	     <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>
+
       <!-- Lexar CF Reader -->
       <match key="@storage.originating_device:usb.vendor_id" int="0x05dc">
         <match key="@storage.originating_device:usb.product_id" int="0x0002">