X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F007-remove_misc_drivers.patch;h=39bef1868ad80dd87697d3f31c1fa4dc210baaee;hb=09a3c19b5fd7a7caedf4f87bd36f56312199624f;hp=1fb8353330d4e2a9b03a15151a3c73942121b65b;hpb=0ed71caefe6aaf9a0ab21851baa038afd5f4fdf6;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/package/mac80211/patches/007-remove_misc_drivers.patch b/package/mac80211/patches/007-remove_misc_drivers.patch
index 1fb8353330..39bef1868a 100644
--- a/package/mac80211/patches/007-remove_misc_drivers.patch
+++ b/package/mac80211/patches/007-remove_misc_drivers.patch
@@ -1,6 +1,15 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -282,13 +282,13 @@ endif
+@@ -196,7 +196,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
+ endif #CONFIG_WIRELESS_EXT
+ 
+ ifneq ($(CONFIG_STAGING),)
+- CONFIG_COMPAT_STAGING=m
++# CONFIG_COMPAT_STAGING=m
+ endif
+ 
+ # mac80211 test driver
+@@ -314,13 +314,13 @@ endif #CONFIG_CRC_ITU_T
  CONFIG_MWL8K=m
  
  # Ethernet drivers go here
@@ -13,24 +22,35 @@
  ifdef CONFIG_COMPAT_KERNEL_27
 -CONFIG_ATL1C=n
 +# CONFIG_ATL1C=n
- else
+ else #CONFIG_COMPAT_KERNEL_27
 -CONFIG_ATL1C=m
 +# CONFIG_ATL1C=m
- endif
+ endif #CONFIG_COMPAT_KERNEL_27
  
- CONFIG_HERMES=m
-@@ -342,10 +342,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
- CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
- CONFIG_USB_NET_COMPAT_CDCETHER=n
- else
+ ifdef CONFIG_WIRELESS_EXT
+@@ -371,17 +371,17 @@ CONFIG_ZD1211RW=m
+ # Note: this depends on CONFIG_USB_NET_RNDIS_HOST and CONFIG_USB_NET_CDCETHER
+ # it also requires new RNDIS_HOST and CDC_ETHER modules which we add
+ ifdef CONFIG_COMPAT_KERNEL_29
+-CONFIG_USB_COMPAT_USBNET=n
+-CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
+-CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
+-CONFIG_USB_NET_COMPAT_CDCETHER=n
++# CONFIG_USB_COMPAT_USBNET=n
++# CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
++# CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
++# CONFIG_USB_NET_COMPAT_CDCETHER=n
+ else #CONFIG_COMPAT_KERNEL_29
 -CONFIG_USB_COMPAT_USBNET=m
++# CONFIG_USB_COMPAT_USBNET=m
+ ifdef CONFIG_USB_NET_CDCETHER
 -CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
 -CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
--CONFIG_USB_NET_COMPAT_CDCETHER=m
-+# CONFIG_USB_COMPAT_USBNET=m
 +# CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
 +# CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
+ endif #CONFIG_USB_NET_CDCETHER
+-CONFIG_USB_NET_COMPAT_CDCETHER=m
 +# CONFIG_USB_NET_COMPAT_CDCETHER=m
- endif
+ endif #CONFIG_COMPAT_KERNEL_29