34643f24ed
adds some more pending patches which (among other things) fix the 'failed to stop RX DMA' messages SVN-Revision: 26506
63 lines
1.7 KiB
Diff
63 lines
1.7 KiB
Diff
--- a/config.mk
|
|
+++ b/config.mk
|
|
@@ -204,7 +204,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
|
|
endif #CONFIG_WIRELESS_EXT
|
|
|
|
ifdef CONFIG_STAGING
|
|
-CONFIG_COMPAT_STAGING=y
|
|
+# CONFIG_COMPAT_STAGING=y
|
|
endif #CONFIG_STAGING
|
|
|
|
# mac80211 test driver
|
|
@@ -342,13 +342,13 @@ endif #CONFIG_CRC_ITU_T
|
|
CONFIG_MWL8K=m
|
|
|
|
# Ethernet drivers go here
|
|
-CONFIG_ATL1=m
|
|
-CONFIG_ATL2=m
|
|
-CONFIG_ATL1E=m
|
|
+# CONFIG_ATL1=m
|
|
+# CONFIG_ATL2=m
|
|
+# CONFIG_ATL1E=m
|
|
ifdef CONFIG_COMPAT_KERNEL_27
|
|
-CONFIG_ATL1C=n
|
|
+# CONFIG_ATL1C=n
|
|
else #CONFIG_COMPAT_KERNEL_27
|
|
-CONFIG_ATL1C=m
|
|
+# CONFIG_ATL1C=m
|
|
endif #CONFIG_COMPAT_KERNEL_27
|
|
|
|
ifdef CONFIG_WIRELESS_EXT
|
|
@@ -403,21 +403,21 @@ endif #CONFIG_COMPAT_KERNEL_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
|
|
-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_RNDIS_HOST=m
|
|
+# CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
|
|
endif #CONFIG_USB_NET_CDCETHER
|
|
ifdef CONFIG_USB_NET_CDCETHER_MODULE
|
|
-CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
|
|
-CONFIG_USB_NET_COMPAT_RNDIS_WLAN=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 #CONFIG_COMPAT_KERNEL_29
|
|
|
|
|