hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi |   13 ++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit db19a56835bafd6bfb955993c963ae78075c8fe7
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Jan 25 17:26:25 2008 +0100

    fixed Dell WWAN fdi file to add device only if dcdbas loaded
    
    Fixed Dell WWAN fdi file to add device only if the needed dcdbas
    kernel module is loaded.

diff --git a/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi b/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi
index b975a8a..5d6f185 100644
--- a/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi
+++ b/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi
@@ -3,11 +3,14 @@
 <deviceinfo version="0.2">
 
   <device>
-    <match key="system.kernel.name" string="Linux"> 
-      <match key="system.hardware.vendor" string="Dell Inc.">
-        <match key="system.formfactor" string="laptop">
-	  <!-- TODO: check if laptop actually sports an SMI interface -->
-          <spawn udi="/org/freedesktop/Hal/devices/dell_wwan_switch"/>
+    <match key="info.bus" string="platform">
+      <match key="platform.id" string="dcdbas">
+        <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell ">
+            <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop">
+              <spawn udi="/org/freedesktop/Hal/devices/dell_wwan_switch"/>
+	    </match>
+          </match>
         </match>
       </match>
     </match>