hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree 5964f3f626d746fa832b65437423b75c315f29c5 (from 828c748d4c920a40e1a591d8a9061bfa15d5cb9b)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Mar 15 12:16:53 2007 +0100

    removed folder information fro YP-U1
    
    Removed portable_audio_player.audio_folders property for the Samsung YP-U1
    to fix fd.o bug #10297

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 338702a..6d9a13c 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -204,7 +204,6 @@
             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
           </match>  
           <!-- Samsung YP-Z5 -->
           <match key="@storage.originating_device:usb.product_id" int="0x5041">