hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-music-players.fdi |    9 ---------
 1 file changed, 9 deletions(-)

New commits:
commit 9aa4791dc10eeaafce6cbac43a742bdbe2c648f2
Author: Martin Pitt <martin at piware.de>
Date:   Thu Nov 15 21:17:31 2007 +0100

    remove Feiya Technology Corp Memory Bar from USB music players
    
    In [1] and its duplicates users complained that many USB sticks use
    the same controller than the Feiya Memory Bar, but aren't capable of
    music playback. That's why we removed it from 10-usb-music-players.fdi
    again (see attached patch).
    
    [1] https://launchpad.net/bugs/90286
    
    Note: this fix also: fd.o bug 12828

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 611881b..801702d 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -346,15 +346,6 @@
           </match>
 	</match>
 
-        <!-- Feiya Technology Corp Memory Bar -->
-        <match key="@storage.originating_device:usb.vendor_id" int="0x090c">
-          <match key="@storage.originating_device:usb.product_id" int="0x1000">
-            <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.input_formats" type="strlist">audio/mpeg</append>
-          </match>
-        </match>
-
 	<!-- Peak Digital Audio Player -->
         <match key="@storage.originating_device:usb.vendor_id" int="0xd7d">
           <match key="@storage.originating_device:usb.product_id" int="0x1651">