hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 08df4733091288ad38c952e19b67118f02206bcf
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Mar 11 19:44:35 2008 +0100

    remove some iRiver USB music players (now in libmpt)
    
    Removed some iRiver USB music players since they are part of
    the fdi-file provided by the libmtp package (usb.product_id: 0x1008,
    0x2101 and 0x2102).

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 9996f2a..7d79adc 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -829,8 +829,8 @@
           <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
           <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
         </match>
-        <!-- iFP 700/800/900/1000/N10 IMM, H10 20/5GB/5,6 MTP -->
-	<match key="usb.product_id" int_outof="0x1007;0x1008;0x1009;0x1010;0x1011;0x2101;0x2102;0x2105">
+        <!-- iFP 700/800/1000/N10 IMM, H10 5,6 MTP -->
+	<match key="usb.product_id" int_outof="0x1007;0x1009;0x1010;0x1011;0x2105">
           <merge key="portable_audio_player.type" type="string">generic</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>