hal: Branch 'master'

[David Zeuthen]

 fdi/information/10freedesktop/10-usb-music-players.fdi |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

New commits:
diff-tree 80c59eb128d8cab66d780aef6e0757369ca607cd (from 29de0a30e5c8bae35055953894ce6a4c16674b53)
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed Apr 25 16:55:57 2007 -0400

    add "requires eject" quirks for Nokia N60/N70
    
    Maybe these need to move to another file; maybe these are really music
    players...
    
    This is from
    
     https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=234845

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index bbca407..7ac70aa 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -87,7 +87,8 @@
 	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
 	  </match>
 	</match>
-	
+
+	<!-- Nokia -->
         <match key="@storage.originating_device:usb.vendor_id" int="0x421">
   	  <!-- Nokia 770 -->
           <match key="@storage.originating_device:usb.product_id" int="0x431">
@@ -105,6 +106,14 @@
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
           </match>
+          <!-- Nokia E60 -->
+          <match key="@storage.physical_device:usb.product_id" int="0x0434">
+            <merge key="storage.requires_eject" type="bool">true</merge>
+          </match>
+          <!-- Nokia E70 -->
+	  <match key="@storage.physical_device:usb.product_id" int="0x0433">
+	    <merge key="storage.requires_eject" type="bool">true</merge>
+	  </match>
         </match>
 
 	<!-- SONICblue -->