hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 1257dd3d4b297799935072f584214a2fc2ec3825
Author: Alexey Fisher <bug-track at fisher-privat.net>
Date:   Thu Jan 29 14:59:32 2009 +0100

    add another Hama USB cardreader
    
    Added another Hama USB cardreader:
       storage.model = 'USB  SM Reader'  (string)
       storage.model = 'USB  MS Reader'  (string)
       storage.model = 'USB  SD Reader'  (string)
       storage.model = 'USB  CF Reader'  (string)
    
    Put the device together with another already existing match.

diff --git a/fdi/information/10freedesktop/10-usb-card-readers.fdi b/fdi/information/10freedesktop/10-usb-card-readers.fdi
index 9810aa1..7068263 100644
--- a/fdi/information/10freedesktop/10-usb-card-readers.fdi
+++ b/fdi/information/10freedesktop/10-usb-card-readers.fdi
@@ -35,20 +35,6 @@
         <merge key="storage.drive_type" type="string">sd_mmc</merge>
       </match>
 
-      <!-- Another common theme -->
-      <match key="storage.model" contains="USB CF Reader">
-        <merge key="storage.drive_type" type="string">compact_flash</merge>
-      </match>
-      <match key="storage.model" contains="USB MS Reader">
-        <merge key="storage.drive_type" type="string">memory_stick</merge>
-      </match>
-      <match key="storage.model" contains="USB SM Reader">
-        <merge key="storage.drive_type" type="string">smart_media</merge>
-      </match>
-      <match key="storage.model" contains="USB SD Reader">
-        <merge key="storage.drive_type" type="string">sd_mmc</merge>
-      </match>
-
       <!-- Yet another common theme -->
       <match key="storage.model" contains="Reader-CF">
         <merge key="storage.drive_type" type="string">compact_flash</merge>
@@ -95,7 +81,7 @@
       </match>
 
       <!-- Hama card reader -->
-      <match key="storage.model" contains="Card">
+      <match key="storage.model" contains_outof="Card;USB">
         <match key="storage.model" contains="Reader">
 	  <match key="storage.model" contains=" CF">
 	    <merge key="storage.drive_type" type="string">compact_flash</merge>