hal: Branch 'master'

[Martin Pitt]

 fdi/policy/10osvendor/20-acl-management.fdi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 93c3cff6ed9ce7378aa37ead8b37e0bc837d6bc0
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Mon Jan 19 12:08:59 2009 +0100

    fix auto ACL management for DRI
    
    Fix copy&paste error which assigned the wrong access_control.file for
    /dev/drm/card* devices. It previously copied "input.device", but
    should be "linux.device_file".

diff --git a/fdi/policy/10osvendor/20-acl-management.fdi b/fdi/policy/10osvendor/20-acl-management.fdi
index 22f325b..83f4f33 100644
--- a/fdi/policy/10osvendor/20-acl-management.fdi
+++ b/fdi/policy/10osvendor/20-acl-management.fdi
@@ -197,7 +197,7 @@
     <!-- graphics cards, e.g. for 3d accelleration -->
     <match key="info.capabilities" contains="drm">
 	<append key="info.capabilities" type="strlist">access_control</append>
-	<merge key="access_control.file" type="copy_property">input.device</merge>
+	<merge key="access_control.file" type="copy_property">linux.device_file</merge>
 	<merge key="access_control.type" type="string">video</merge>
     </match>