--- a/config.mk
+++ b/config.mk
@@ -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
 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
 
 CONFIG_HERMES=m
@@ -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
-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
-CONFIG_USB_NET_COMPAT_CDCETHER=m
+# CONFIG_USB_NET_COMPAT_CDCETHER=m
 endif #CONFIG_COMPAT_KERNEL_29
 
 
@@ -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