X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F007-remove_misc_drivers.patch;h=37c03f2eef46715616c66d7b5625e1e8b625a3b3;hb=a040c13eb6c63e1799ce17ad8d3dd2267d9ae4b3;hp=e4504e1352a406bc51b07983a97fe6825cae968d;hpb=266275eef404f91ccdaae0089bf1fd0c5adbdc4c;p=openwrt.git

diff --git a/package/mac80211/patches/007-remove_misc_drivers.patch b/package/mac80211/patches/007-remove_misc_drivers.patch
index e4504e1352..37c03f2eef 100644
--- a/package/mac80211/patches/007-remove_misc_drivers.patch
+++ b/package/mac80211/patches/007-remove_misc_drivers.patch
@@ -1,15 +1,15 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -204,7 +204,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
+@@ -212,7 +212,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
  endif #CONFIG_WIRELESS_EXT
  
- ifneq ($(CONFIG_STAGING),)
-- CONFIG_COMPAT_STAGING=m
+ ifdef CONFIG_STAGING
+-CONFIG_COMPAT_STAGING=m
 +# CONFIG_COMPAT_STAGING=m
- endif
+ endif #CONFIG_STAGING
  
  # mac80211 test driver
-@@ -342,13 +342,13 @@ endif #CONFIG_CRC_ITU_T
+@@ -365,13 +365,13 @@ endif #CONFIG_CRC_ITU_T
  CONFIG_MWL8K=m
  
  # Ethernet drivers go here
@@ -19,19 +19,19 @@
 +# CONFIG_ATL1=m
 +# CONFIG_ATL2=m
 +# CONFIG_ATL1E=m
- ifdef CONFIG_COMPAT_KERNEL_27
+ ifdef CONFIG_COMPAT_KERNEL_2_6_27
 -CONFIG_ATL1C=n
 +# CONFIG_ATL1C=n
- else #CONFIG_COMPAT_KERNEL_27
+ else #CONFIG_COMPAT_KERNEL_2_6_27
 -CONFIG_ATL1C=m
 +# CONFIG_ATL1C=m
- endif #CONFIG_COMPAT_KERNEL_27
+ endif #CONFIG_COMPAT_KERNEL_2_6_27
  
  ifdef CONFIG_WIRELESS_EXT
-@@ -403,21 +403,21 @@ endif #CONFIG_COMPAT_KERNEL_29
+@@ -431,21 +431,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_29
+ ifdef CONFIG_COMPAT_KERNEL_2_6_29
 -CONFIG_USB_COMPAT_USBNET=n
 -CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
 -CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
@@ -40,7 +40,7 @@
 +# 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
+ else #CONFIG_COMPAT_KERNEL_2_6_29
 -CONFIG_USB_COMPAT_USBNET=m
 +# CONFIG_USB_COMPAT_USBNET=m
  ifdef CONFIG_USB_NET_CDCETHER
@@ -57,6 +57,6 @@
  endif #CONFIG_USB_NET_CDCETHER
 -CONFIG_USB_NET_COMPAT_CDCETHER=m
 +# CONFIG_USB_NET_COMPAT_CDCETHER=m
- endif #CONFIG_COMPAT_KERNEL_29
+ endif #CONFIG_COMPAT_KERNEL_2_6_29