hal: Branch 'master'

[David Zeuthen]

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

New commits:
diff-tree 82e98c8a681d1ffce72d6fe19344dc396ed282d8 (from c6ec0f90642ce8862cd3701e3862a72805e8fe4f)
Author: David Zeuthen <davidz at redhat.com>
Date:   Tue Sep 25 16:33:38 2007 -0400

    swap errornous MMC and SmartMedia entries for card reader
    
    From Carlos Corbacho <cathectic at slackadelic.com>:
    
    I have a card reader here that matches the product & device ID of the "Noname
    multi-card Reader" (this particular one is a "Vantec 7-in-1").
    
    However, on my device, the LUNs for Smart Media and Memory Stick appear to be
    reversed (patch below to illustrate - I don't have any CF or SD/ MMC cards,
    so cannot vouch for those entries).
    
    Is this a case of an error in the original patch, or do we have multiple card
    readers with the same IDs, but different devices on different LUNs?

diff --git a/fdi/information/10freedesktop/10-usb-card-readers.fdi b/fdi/information/10freedesktop/10-usb-card-readers.fdi
index 44b07f8..243317a 100644
--- a/fdi/information/10freedesktop/10-usb-card-readers.fdi
+++ b/fdi/information/10freedesktop/10-usb-card-readers.fdi
@@ -98,13 +98,13 @@
 		     <merge key="storage.drive_type" type="string">compact_flash</merge>
 	     </match>
 	     <match key="storage.lun" int="1">
-		     <merge key="storage.drive_type" type="string">memory_stick</merge>
+		     <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">smart_media</merge>
+		     <merge key="storage.drive_type" type="string">memory_stick</merge>
 	     </match>
         </match>
       </match>