--- a/config.mk
+++ b/config.mk
-@@ -196,7 +196,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
+@@ -204,7 +204,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
endif #CONFIG_WIRELESS_EXT
- ifneq ($(CONFIG_STAGING),)
-- CONFIG_COMPAT_STAGING=m
-+# CONFIG_COMPAT_STAGING=m
- endif
+ ifdef CONFIG_STAGING
+-CONFIG_COMPAT_STAGING=y
++# CONFIG_COMPAT_STAGING=y
+ endif #CONFIG_STAGING
# mac80211 test driver
-@@ -324,13 +324,13 @@ endif #CONFIG_CRC_ITU_T
+@@ -342,13 +342,13 @@ endif #CONFIG_CRC_ITU_T
CONFIG_MWL8K=m
# Ethernet drivers go here
endif #CONFIG_COMPAT_KERNEL_27
ifdef CONFIG_WIRELESS_EXT
-@@ -381,21 +381,21 @@ CONFIG_ZD1211RW=m
+@@ -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