hal: Branch 'master'

[Jeff Mitchell]

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

New commits:
commit 9fd07aedb5e26adf75b3a9130e55eef368b1220c
Author: Jeff Mitchell <kde-dev at emailgoeshere.com>
Date:   Fri Jan 11 11:45:59 2008 -0500

    D'oh, I forgot to get this in before 0.5.10 was released.  Oh well.  Fix the Rio Karma entry to expose the access protocol.  Karmas are not simply generic
    devices, they require a lot of special love and special access.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 7e77d10..01a4c76 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -119,6 +119,7 @@
           <match key="@storage.originating_device:usb.product_id" int="0x5210">
             <merge key="portable_audio_player.type" type="string">generic</merge>
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <addset key="portable_audio_player.access_method.protocols" type="strlist">karma</addset>                      
             <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>