X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F007-remove_misc_drivers.patch;h=9e7f65166510c9025471b48d4ede23a4154554f9;hb=de017af48d93a4c8bd0691f5cb9315e2f5f15cf1;hp=afd7161a2bf1cbdc151be17272d5e49aac204cc7;hpb=c1a68ed433f7fa2a9e1ffed0433f75dd11ba681c;p=openwrt.git

diff --git a/package/mac80211/patches/007-remove_misc_drivers.patch b/package/mac80211/patches/007-remove_misc_drivers.patch
index afd7161a2b..9e7f651665 100644
--- a/package/mac80211/patches/007-remove_misc_drivers.patch
+++ b/package/mac80211/patches/007-remove_misc_drivers.patch
@@ -1,32 +1,61 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -270,10 +270,10 @@ endif
- CONFIG_MWL8K=m
+@@ -241,7 +241,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
+ endif #CONFIG_WIRELESS_EXT
+ 
+ ifdef CONFIG_STAGING
+-export CONFIG_COMPAT_STAGING=m
++# export CONFIG_COMPAT_STAGING=m
+ endif #CONFIG_STAGING
+ 
+ # mac80211 test driver
+@@ -406,12 +406,12 @@ endif #CONFIG_CRC_ITU_T
+ export CONFIG_MWL8K=m
  
  # Ethernet drivers go here
--CONFIG_ATL1=m
--CONFIG_ATL2=m
--CONFIG_ATL1E=m
--CONFIG_ATL1C=m
-+# CONFIG_ATL1=m
-+# CONFIG_ATL2=m
-+# CONFIG_ATL1E=m
-+# CONFIG_ATL1C=m
+-export CONFIG_ATL1=m
+-export CONFIG_ATL2=m
+-export CONFIG_ATL1E=m
++# export CONFIG_ATL1=m
++# export CONFIG_ATL2=m
++# export CONFIG_ATL1E=m
+ ifndef CONFIG_COMPAT_KERNEL_2_6_28
+-export CONFIG_ATL1C=m
+-export CONFIG_ALX=m
++# export CONFIG_ATL1C=m
++# export CONFIG_ALX=m
+ endif #CONFIG_COMPAT_KERNEL_2_6_28
  
- CONFIG_HERMES=m
- CONFIG_HERMES_CACHE_FW_ON_INIT=y
-@@ -326,10 +326,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
- CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
- CONFIG_USB_NET_COMPAT_CDCETHER=n
- else
--CONFIG_USB_COMPAT_USBNET=m
--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
-+# CONFIG_USB_NET_COMPAT_CDCETHER=m
- endif
+ ifdef CONFIG_WIRELESS_EXT
+@@ -472,21 +472,21 @@ endif #CONFIG_COMPAT_KERNEL_2_6_29
+ # 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_2_6_29
+-export CONFIG_USB_COMPAT_USBNET=n
+-export CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
+-export CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
+-export CONFIG_USB_NET_COMPAT_CDCETHER=n
++# export CONFIG_USB_COMPAT_USBNET=n
++# export CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
++# export CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
++# export CONFIG_USB_NET_COMPAT_CDCETHER=n
+ else #CONFIG_COMPAT_KERNEL_2_6_29
+-export CONFIG_USB_COMPAT_USBNET=m
++# export CONFIG_USB_COMPAT_USBNET=m
+ ifdef CONFIG_USB_NET_CDCETHER
+-export CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
+-export CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
++# export CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
++# export CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
+ endif #CONFIG_USB_NET_CDCETHER
+ ifdef CONFIG_USB_NET_CDCETHER_MODULE
+-export CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
+-export CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
++# export CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
++# export CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
+ endif #CONFIG_USB_NET_CDCETHER
+-export CONFIG_USB_NET_COMPAT_CDCETHER=m
++# export CONFIG_USB_NET_COMPAT_CDCETHER=m
+ endif #CONFIG_COMPAT_KERNEL_2_6_29