linux-wlan-ng (0.2.9+dfsg-4) CONF_etc_pcmcia_wlan-ng_conf.dpatch

#! /bin/sh /usr/share/dpatch/dpatch-run
## CONF_etc_pcmcia_wlan-ng_conf.dpatch by Victor Seva <linuxmaniac@torreviejawireless.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Comment out some cards better handled by other kernel module

@DPATCH@
diff -urNad linux-wlan-ng-0.2.2~/etc/pcmcia/wlan-ng.conf linux-wlan-ng-0.2.2/etc/pcmcia/wlan-ng.conf
--- linux-wlan-ng-0.2.2~/etc/pcmcia/wlan-ng.conf	2005-10-23 21:09:06.000000000 +0200
+++ linux-wlan-ng-0.2.2/etc/pcmcia/wlan-ng.conf	2005-10-23 21:11:21.000000000 +0200
@@ -2,9 +2,11 @@
 device "prism2_cs"
    class "wlan-ng" module "prism2_cs"
 
-card "Intersil PRISM2 Reference Design 11Mb/s 802.11b WLAN Card"
-   version "INTERSIL", "HFA384x/IEEE"
-   bind "prism2_cs"
+# This is commented out as the regular orinoco drivers can handle this
+# card.
+#card "Intersil PRISM2 Reference Design 11Mb/s 802.11b WLAN Card"
+#   version "INTERSIL", "HFA384x/IEEE"
+#   bind "prism2_cs"
 
 card "Compaq WL100/200 11Mb/s 802.11b WLAN Card"
    manfid 0x0138, 0x0002
@@ -25,10 +27,11 @@
 card "ZoomAir 4100 11Mb/s 802.11b WLAN Card"
    version "ZoomAir 11Mbps High", "Rate wireless Networking"
    bind "prism2_cs"
-
-card "Linksys WPC11 11Mbps 802.11b WLAN Card"
-   version "Instant Wireless ", " Network PC CARD", "Version 01.02"
-   bind "prism2_cs"
+# Disabled in Debian package because the normal pcmcia drivers handle this
+# one.
+#card "Linksys WPC11 11Mbps 802.11b WLAN Card"
+#   version "Instant Wireless ", " Network PC CARD", "Version 01.02"
+#   bind "prism2_cs"
 
 card "Addtron AWP-100 11Mbps 802.11b WLAN Card"
    version "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02"
@@ -116,9 +119,11 @@
    manfid 0x1668, 0x0101
    bind "prism2_cs"
 
-card "3Com AirConnect 3CRWE737A"
-   version "3Com", "3CRWE737A AirConnect Wireless LAN PC Card"
-   bind "prism2_cs" 
+# This one is disabled as well due to conflict with the normal pcmcia
+# drivers.
+#card "3Com AirConnect 3CRWE737A"
+#   version "3Com", "3CRWE737A AirConnect Wireless LAN PC Card"
+#   bind "prism2_cs" 
 
 card "3Com AirConnect 3CRWE777A"
    version "3Com", "3CRWE777A AirConnect Wireless LAN PCI Card"  
@@ -145,9 +150,11 @@
   manfid 0x028a, 0x0673
   bind "prism2_cs"
 
-card "NETGEAR MA401RA 11Mbps 802.11 WLAN Card"
-   version "NETGEAR MA401RA Wireless PC", "Card", "ISL37300P", "Eval-RevA"
-   bind "prism2_cs"
+# This is commented out as the regular orinoco drivers can handle this
+# card.
+#card "NETGEAR MA401RA 11Mbps 802.11 WLAN Card"
+#   version "NETGEAR MA401RA Wireless PC", "Card", "ISL37300P", "Eval-RevA"
+#   bind "prism2_cs"
 
 card "D-Link DCF-660W  11Mbps 802.11b WLAN Card"
   manfid 0xd601, 0x0005
@@ -174,9 +181,11 @@
 #  version "D-Link", "DWL-650 Wireless PC Card RevP", "ISL37101P-10", "A3"
    bind "prism2_cs"
 
-card "I-Gate 11M PC Card"
-   version "INTERSIL",  "I-GATE 11M PC Card / PC Card plus", "Version 01.02"
-   bind "prism2_cs"
+# This one is commented out since it matches the common lucent/orinoco
+# card.
+#card "I-Gate 11M PC Card"
+#   version "INTERSIL",  "I-GATE 11M PC Card / PC Card plus", "Version 01.02"
+#   bind "prism2_cs"
 
 card "benQ AWL100 802.11b WLAN Card"
    version "BENQ", "AWL100 PCMCIA ADAPTER", "ISL37300P", "Eval-RevA"