hal: Branch 'master'

[David Zeuthen]

 fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi |   23 +++++++++++++++++
 1 files changed, 23 insertions(+)

New commits:
diff-tree 8f16ce896e8ccc3fef023aa6a9e22021f2b3eba6 (from f1d80599c70258db2013b52e8fb1e785fb5f1a6a)
Author: Adel Gadllah <adel.gadllah at gmail.com>
Date:   Tue Jul 17 11:29:51 2007 -0400

    add rf kill support for iwl3945 and iwl4965
    
    The iwlwifi driver uses the same rf_kill interface as the
    ipw2100/2200/3945 driver. So all we need to support it is to add it to
    the .fdi file. The attached patch adds support for the iwl3945 and
    iwl4965 drivers

diff --git a/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi b/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
index 983e940..114dc16 100644
--- a/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
+++ b/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
@@ -1,6 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <deviceinfo version="0.2">
+
+  <device>
+    <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop">
+      <!-- Don't use generic ipw rfkill on Dells -->
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" contains_not="Dell">
+        <match key="info.linux.driver" string="iwl4965">
+          <spawn udi="/org/freedesktop/Hal/devices/ipw_wlan_switch"/>
+        </match>
+      </match>
+    </match>
+  </device>
+
+  <device>
+    <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop">
+      <!-- Don't use generic ipw rfkill on Dells -->
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" contains_not="Dell">
+        <match key="info.linux.driver" string="iwl3945">
+          <spawn udi="/org/freedesktop/Hal/devices/ipw_wlan_switch"/>
+        </match>
+      </match>
+    </match>
+  </device>
+
   <device>
     <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop">
       <!-- Don't use generic ipw rfkill on Dells -->