hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree d2f814dfe71cd13daf66188ab6360b3b73280c99 (from d1f6326099eff8392a8fb706bdd67baa11c9ec88)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Jul 3 11:02:29 2007 +0200

    cleaned up Maxfield MAX-SIN TOUCH entry
    
    Removed line from the Maxfield MAX-SIN TOUCH entry. Don't add audio/mpeg to
    portable_audio_player.output_formats in the player block/entry, this get
    already added for all music players.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 3ccc1a5..862e62d 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -789,7 +789,6 @@
           <match key="@storage.originating_device:usb.product_id" int="0x0110">
             <merge key="portable_audio_player.type" type="string">generic</merge>
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>