2010-01-07 19:15:05 +00:00
|
|
|
--- a/config.mk
|
|
|
|
|
+++ b/config.mk
|
2010-08-31 23:34:21 +00:00
|
|
|
@@ -196,7 +196,7 @@ ifneq ($(CONFIG_WIRELESS_EXT),)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifneq ($(CONFIG_STAGING),)
|
|
|
|
|
-CONFIG_COMPAT_STAGING=m
|
|
|
|
|
+# CONFIG_COMPAT_STAGING=m
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# mac80211 test driver
|
|
|
|
|
@@ -306,13 +306,13 @@ endif
|
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-03-26 22:36:12 +00:00
|
|
|
CONFIG_HERMES=m
|
2010-08-31 23:34:21 +00:00
|
|
|
@@ -361,17 +361,17 @@ CONFIG_ZD1211RW=m
|
|
|
|
|
# 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
|
|
|
|
|
+# 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
|
|
|
|
|
|
|
|
|
2010-08-31 23:34:21 +00:00
|
|
|
@@ -474,17 +474,17 @@ CONFIG_BT_MRVL_SDIO=m
|
|
|
|
|
|
|
|
|
|
ifneq ($(CONFIG_COMPAT_STAGING),)
|
|
|
|
|
ifdef CONFIG_COMPAT_KERNEL_32
|
|
|
|
|
-CONFIG_ATH6KL_CFG80211=y
|
|
|
|
|
-CONFIG_ATH6KL_DEBUG=y
|
|
|
|
|
+# CONFIG_ATH6KL_CFG80211=y
|
|
|
|
|
+# CONFIG_ATH6KL_DEBUG=y
|
|
|
|
|
# CONFIG_ATH6KL_DISABLE_TARGET_DBGLOGS is not set
|
|
|
|
|
# CONFIG_ATH6KL_ENABLE_COEXISTENCE is not set
|
|
|
|
|
# CONFIG_ATH6KL_ENABLE_HOST_DEBUG is not set
|
|
|
|
|
-CONFIG_ATH6KL_ENABLE_TARGET_DEBUG_PRINTS=y
|
|
|
|
|
+# CONFIG_ATH6KL_ENABLE_TARGET_DEBUG_PRINTS=y
|
|
|
|
|
# CONFIG_ATH6KL_HCI_BRIDGE is not set
|
|
|
|
|
# CONFIG_ATH6KL_HTC_RAW_INTERFACE is not set
|
|
|
|
|
# CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK is not set
|
|
|
|
|
-CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
|
|
|
|
|
-CONFIG_ATH6K_LEGACY=m
|
|
|
|
|
+# CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
|
|
|
|
|
+# CONFIG_ATH6K_LEGACY=m
|
|
|
|
|
endif #CONFIG_COMPAT_KERNEL_32
|
|
|
|
|
endif
|
|
|
|
|
|
