hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree 44ddbb607a12a59039b6255e83a14fdd02444b55 (from 4d8b0bde1fef59c99ff6b58d00d7167b27fc2a08)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed May 30 11:36:48 2007 +0200

    fixed USB card reader entries from commit ae31fad7
    
    Fixed USB card reader entry from commit ae31fad7 to not use deprecated
    physical_device* properties.

diff --git a/fdi/information/10freedesktop/10-usb-card-readers.fdi b/fdi/information/10freedesktop/10-usb-card-readers.fdi
index b0fb54c..44b07f8 100644
--- a/fdi/information/10freedesktop/10-usb-card-readers.fdi
+++ b/fdi/information/10freedesktop/10-usb-card-readers.fdi
@@ -92,8 +92,8 @@
 </match>
 
       <!-- Noname multi-card Reader -->
-      <match key="@storage.physical_device:usb.vendor_id" int="0x05e3">
-	  <match key="@storage.physical_device:usb.product_id" int="0x0760">
+      <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>