hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-card-readers.fdi |   26 ++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

New commits:
commit 40b83517f1cf9a5a51cb5b65462f7ca94b0e7fbd
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Jan 8 17:44:54 2009 +0100

    add a more generic match for card readers
    
    Added a more generic match for card readers to match devices
    with 'CardReader' and 'Card Reader' in one common match.

diff --git a/fdi/information/10freedesktop/10-usb-card-readers.fdi b/fdi/information/10freedesktop/10-usb-card-readers.fdi
index 80a34aa..9810aa1 100644
--- a/fdi/information/10freedesktop/10-usb-card-readers.fdi
+++ b/fdi/information/10freedesktop/10-usb-card-readers.fdi
@@ -95,17 +95,21 @@
       </match>
 
       <!-- Hama card reader -->
-      <match key="storage.model" contains="Card Reader   CF">
-	<merge key="storage.drive_type" type="string">compact_flash</merge>
-      </match>
-      <match key="storage.model" contains="Card Reader   MS">
-	<merge key="storage.drive_type" type="string">memory_stick</merge>
-      </match>
-      <match key="storage.model" contains="Card Reader   SM">
-	<merge key="storage.drive_type" type="string">smart_media</merge>
-      </match>
-      <match key="storage.model" contains="CardReaderMMC/SD">
-	<merge key="storage.drive_type" type="string">sd_mmc</merge>
+      <match key="storage.model" contains="Card">
+        <match key="storage.model" contains="Reader">
+	  <match key="storage.model" contains=" CF">
+	    <merge key="storage.drive_type" type="string">compact_flash</merge>
+          </match>
+          <match key="storage.model" contains=" MS">
+	    <merge key="storage.drive_type" type="string">memory_stick</merge>
+          </match>
+          <match key="storage.model" contains=" SM">
+	    <merge key="storage.drive_type" type="string">smart_media</merge>
+          </match>
+          <match key="storage.model" contains_outof="MMC/SD; SD">
+	    <merge key="storage.drive_type" type="string">sd_mmc</merge>
+          </match>
+        </match>
       </match>
 
       <!-- Noname multi-card Readers (vendor: Genesys Logic) -->