diff --git a/arch/arm/configs/cyanogen_hikari_row_defconfig b/arch/arm/configs/cyanogen_hikari_row_defconfig
index c4839ba25a52bb85a492da653e08510a0ae9cf3d..2ab3b1b1c221f54ef316232b46c3b27e6fc42a26 100644
--- a/arch/arm/configs/cyanogen_hikari_row_defconfig
+++ b/arch/arm/configs/cyanogen_hikari_row_defconfig
@@ -1,6 +1,7 @@
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCALVERSION="-FXP"
 # CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_KERNEL_LZMA=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_IKCONFIG=y
@@ -79,7 +80,7 @@ CONFIG_COMPACTION=y
 CONFIG_VMALLOC_RESERVE=0x23200000
 CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
 CONFIG_CP_ACCESS=y
-CONFIG_CMDLINE="androidboot.hardware=semc androidboot.baseband=msm kgsl.mmutype=gpummu"
+CONFIG_CMDLINE="androidboot.hardware=semc androidboot.baseband=msm kgsl.mmutype=gpummu no_console_suspend"
 CONFIG_CMDLINE_EXTEND=y
 CONFIG_CRASH_NOTES=y
 CONFIG_CPU_FREQ=y
@@ -220,6 +221,7 @@ CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_H4=y
 # CONFIG_MSM_BT_POWER is not set
 CONFIG_CFG80211=y
+CONFIG_NL80211_TESTMODE=y
 # CONFIG_CFG80211_WEXT is not set
 CONFIG_CFG80211_ALLOW_RECONNECT=y
 CONFIG_RFKILL=y
@@ -248,14 +250,13 @@ CONFIG_MD=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_DM_CRYPT=y
 CONFIG_NETDEVICES=y
-CONFIG_DUMMY=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
+CONFIG_IFB=y
+CONFIG_TUN=y
+CONFIG_WIFI_CONTROL_FUNC=y
 CONFIG_BCMDHD=y
 CONFIG_BCMDHD_FW_PATH="/vendor/firmware/fw_bcmdhd.bin"
 CONFIG_BCMDHD_NVRAM_PATH="/system/etc/wifi/calibration"
-CONFIG_IFB=y
-CONFIG_TUN=y
+CONFIG_DHD_ENABLE_P2P=y
 CONFIG_USB_USBNET=y
 CONFIG_PPP=y
 CONFIG_PPP_DEFLATE=y
diff --git a/arch/arm/configs/cyanogen_nozomi_defconfig b/arch/arm/configs/cyanogen_nozomi_defconfig
index 4c314d3b2f0e6e21ae7cec79cf795e687cfef3cb..214d1460893a20954565f6cf1999d828f9bfc727 100644
--- a/arch/arm/configs/cyanogen_nozomi_defconfig
+++ b/arch/arm/configs/cyanogen_nozomi_defconfig
@@ -1,6 +1,7 @@
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCALVERSION="-FXP"
 # CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_KERNEL_LZMA=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_IKCONFIG=y
@@ -78,7 +79,7 @@ CONFIG_COMPACTION=y
 CONFIG_VMALLOC_RESERVE=0x23200000
 CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
 CONFIG_CP_ACCESS=y
-CONFIG_CMDLINE="androidboot.hardware=semc androidboot.baseband=msm kgsl.mmutype=gpummu"
+CONFIG_CMDLINE="androidboot.hardware=semc androidboot.baseband=msm kgsl.mmutype=gpummu no_console_suspend"
 CONFIG_CMDLINE_EXTEND=y
 CONFIG_CRASH_NOTES=y
 CONFIG_CPU_FREQ=y
@@ -219,6 +220,7 @@ CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_H4=y
 # CONFIG_MSM_BT_POWER is not set
 CONFIG_CFG80211=y
+CONFIG_NL80211_TESTMODE=y
 # CONFIG_CFG80211_WEXT is not set
 CONFIG_CFG80211_ALLOW_RECONNECT=y
 CONFIG_RFKILL=y
@@ -247,14 +249,13 @@ CONFIG_MD=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_DM_CRYPT=y
 CONFIG_NETDEVICES=y
-CONFIG_DUMMY=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
+CONFIG_IFB=y
+CONFIG_TUN=y
+CONFIG_WIFI_CONTROL_FUNC=y
 CONFIG_BCMDHD=y
 CONFIG_BCMDHD_FW_PATH="/vendor/firmware/fw_bcmdhd.bin"
 CONFIG_BCMDHD_NVRAM_PATH="/system/etc/wifi/calibration"
-CONFIG_IFB=y
-CONFIG_TUN=y
+CONFIG_DHD_ENABLE_P2P=y
 CONFIG_USB_USBNET=y
 CONFIG_PPP=y
 CONFIG_PPP_DEFLATE=y