diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf
index d969ce17ef..eb69c379d2 100644
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.17.6 Kernel Configuration
+# Linux/x86_64 3.17.7 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -1316,9 +1316,9 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_TEAM is not set
 # CONFIG_MACVLAN is not set
 # CONFIG_VXLAN is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
+CONFIG_NETCONSOLE=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
 CONFIG_TUN=y
 # CONFIG_VETH is not set
 # CONFIG_NLMON is not set
diff --git a/projects/imx6/linux/linux.arm.conf b/projects/imx6/linux/linux.arm.conf
index 8241fb8faf..db3f148065 100644
--- a/projects/imx6/linux/linux.arm.conf
+++ b/projects/imx6/linux/linux.arm.conf
@@ -899,7 +899,7 @@ CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
 # CONFIG_BT_HCIVHCI is not set
 CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=y
+CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
 # CONFIG_AF_RXRPC is not set
 CONFIG_WIRELESS=y
@@ -1268,6 +1268,7 @@ CONFIG_NET_CORE=y
 # CONFIG_VXLAN is not set
 CONFIG_NETCONSOLE=y
 CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
 CONFIG_NET_POLL_CONTROLLER=y
 CONFIG_TUN=y
 # CONFIG_VETH is not set