2010-01-07 19:15:05 +00:00
|
|
|
--- a/config.mk
|
|
|
|
|
+++ b/config.mk
|
2010-09-14 22:53:54 +00:00
|
|
|
@@ -196,7 +196,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
|
|
|
|
|
endif #CONFIG_WIRELESS_EXT
|
2010-08-31 23:34:21 +00:00
|
|
|
|
|
|
|
|
ifneq ($(CONFIG_STAGING),)
|
2010-09-14 22:53:54 +00:00
|
|
|
- CONFIG_COMPAT_STAGING=m
|
2010-08-31 23:34:21 +00:00
|
|
|
+# CONFIG_COMPAT_STAGING=m
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# mac80211 test driver
|
2010-12-11 01:45:12 +00:00
|
|
|
@@ -326,13 +326,13 @@ endif #CONFIG_CRC_ITU_T
|
2010-01-07 19:15:05 +00:00
|
|
|
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
|
2010-06-10 23:12:10 +00:00
|
|
|
ifdef CONFIG_COMPAT_KERNEL_27
|
|
|
|
|
-CONFIG_ATL1C=n
|
|
|
|
|
+# CONFIG_ATL1C=n
|
2010-08-31 23:34:21 +00:00
|
|
|
else #CONFIG_COMPAT_KERNEL_27
|
2010-06-10 23:12:10 +00:00
|
|
|
-CONFIG_ATL1C=m
|
2010-01-07 19:15:05 +00:00
|
|
|
+# CONFIG_ATL1C=m
|
2010-08-31 23:34:21 +00:00
|
|
|
endif #CONFIG_COMPAT_KERNEL_27
|
2010-01-07 19:15:05 +00:00
|
|
|
|
2010-09-14 22:53:54 +00:00
|
|
|
ifdef CONFIG_WIRELESS_EXT
|
2010-12-11 01:45:12 +00:00
|
|
|
@@ -383,21 +383,21 @@ CONFIG_ZD1211RW=m
|
2010-08-31 23:34:21 +00:00
|
|
|
# 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
|
2010-01-07 19:15:05 +00:00
|
|
|
-CONFIG_USB_COMPAT_USBNET=m
|
2010-08-31 23:34:21 +00:00
|
|
|
+# CONFIG_USB_COMPAT_USBNET=m
|
|
|
|
|
ifdef CONFIG_USB_NET_CDCETHER
|
2010-01-07 19:15:05 +00:00
|
|
|
-CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
|
|
|
|
|
-CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
|
|
|
|
|
+# CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
|
2010-12-04 01:32:04 +00:00
|
|
|
+# 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
|
2010-01-07 19:15:05 +00:00
|
|
|
+# CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
|
2010-08-31 23:34:21 +00:00
|
|
|
endif #CONFIG_USB_NET_CDCETHER
|
|
|
|
|
-CONFIG_USB_NET_COMPAT_CDCETHER=m
|
2010-01-07 19:15:05 +00:00
|
|
|
+# CONFIG_USB_NET_COMPAT_CDCETHER=m
|
2010-08-31 23:34:21 +00:00
|
|
|
endif #CONFIG_COMPAT_KERNEL_29
|
2010-01-07 19:15:05 +00:00
|
|
|
|
|
|
|
|
|
