[package] grub: fix build with automake v1.11.3 (#11228)

[openwrt.git] / package / mac80211 / patches / 007-remove_misc_drivers.patch

diff --git a/package/mac80211/patches/007-remove_misc_drivers.patch b/package/mac80211/patches/007-remove_misc_drivers.patch
index 1181c42..750b95d 100644 (file)
--- a/package/mac80211/patches/007-remove_misc_drivers.patch
+++ b/package/mac80211/patches/007-remove_misc_drivers.patch
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
 --- a/config.mk
 +++ b/config.mk

-@@ -252,7 +252,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
+@@ -242,7 +242,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT

  endif #CONFIG_WIRELESS_EXT
  
  ifdef CONFIG_STAGING
  endif #CONFIG_WIRELESS_EXT
  
  ifdef CONFIG_STAGING


@@ -9,7 +9,7 @@
  endif #CONFIG_STAGING
  
  # mac80211 test driver
  endif #CONFIG_STAGING
  
  # mac80211 test driver

-@@ -406,13 +406,13 @@ endif #CONFIG_CRC_ITU_T
+@@ -396,15 +396,15 @@ endif #CONFIG_CRC_ITU_T

  CONFIG_MWL8K=m
  
  # Ethernet drivers go here
  CONFIG_MWL8K=m
  
  # Ethernet drivers go here


@@ -21,14 +21,18 @@
 +# CONFIG_ATL1E=m
  ifdef CONFIG_COMPAT_KERNEL_2_6_27
 -CONFIG_ATL1C=n
 +# CONFIG_ATL1E=m
  ifdef CONFIG_COMPAT_KERNEL_2_6_27
 -CONFIG_ATL1C=n

+-CONFIG_ALX=m

 +# CONFIG_ATL1C=n
 +# CONFIG_ATL1C=n

++# CONFIG_ALX=m

  else #CONFIG_COMPAT_KERNEL_2_6_27
  else #CONFIG_COMPAT_KERNEL_2_6_27

--CONFIG_ATL1C=m
-+# CONFIG_ATL1C=m
+-CONFIG_ATL1C=n
+-CONFIG_ALX=m
++# CONFIG_ATL1C=n
++# CONFIG_ALX=m

  endif #CONFIG_COMPAT_KERNEL_2_6_27
  
  ifdef CONFIG_WIRELESS_EXT
  endif #CONFIG_COMPAT_KERNEL_2_6_27
  
  ifdef CONFIG_WIRELESS_EXT

-@@ -471,21 +471,21 @@ endif #CONFIG_COMPAT_KERNEL_2_6_29
+@@ -465,21 +465,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
  # 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