hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi |   47 -----------------
 1 file changed, 1 insertion(+), 46 deletions(-)

New commits:
diff-tree 151368d14d8bf8e166dbfbfd8d74f469dada9935 (from 20de779322130941372c8e6318bd648c1565b006)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Aug 29 14:35:56 2007 +0200

    consolidate 10-ipw-rfkill-switch.fdi
    
    Used new *_outof fdi match directives to reduce the number of matches
    and the size of the file.

diff --git a/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi b/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
index 114dc16..11e0814 100644
--- a/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
+++ b/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
@@ -6,52 +6,7 @@
     <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 -->
-      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" contains_not="Dell">
-        <match key="info.linux.driver" string="ipw3945">
-          <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="ipw2200">
-          <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="ipw2100">
+        <match key="info.linux.driver" string_outof="iwl4965;iwl3945;ipw3945;ipw2200;ipw2100">
           <spawn udi="/org/freedesktop/Hal/devices/ipw_wlan_switch"/>
         </match>
       </match>