i777, i9100, n7000: regenerate defconfigs

Change-Id: Ibf954e20e70c9e6dac75b8e1da02bf5a1152098c

3 files changed, 42 insertions, 66 deletions

diff --git a/arch/arm/configs/cyanogenmod_i777_defconfig b/arch/arm/configs/cyanogenmod_i777_defconfig
index 9b6c8b1fdac..e6d52b78a5c 100644
--- a/arch/arm/configs/cyanogenmod_i777_defconfig
+++ b/arch/arm/configs/cyanogenmod_i777_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/arm 3.0.31 Kernel Configuration
+# Linux/arm 3.0.64 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -182,6 +182,7 @@ CONFIG_IOSCHED_ROW=y
 CONFIG_IOSCHED_SIO=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_ROW is not set
 # CONFIG_DEFAULT_SIO is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
@@ -412,9 +413,9 @@ CONFIG_BUSFREQ=y
 # CONFIG_BUSFREQ_DEBUG is not set
 # CONFIG_BUSFREQ_L2_160M is not set
 CONFIG_SEC_THERMISTOR=y
-# CONFIG_SEC_SUBTHERMISTOR is not set
 # CONFIG_EXYNOS_SYSREG_PM is not set
 # CONFIG_ANDROID_WIP is not set
+# CONFIG_COMPACTION_RETRY is not set
 
 #
 # EXYNOS4 Machines
@@ -530,11 +531,6 @@ CONFIG_SEC_MODEM_U1=y
 # CONFIG_SEC_MODEM_P8LTE is not set
 # CONFIG_SEC_MODEM_T0_TD_DUAL is not set
 # CONFIG_SEC_MODEM_U1_SPR is not set
-
-#
-# Connectivity Feature
-#
-# CONFIG_GPS_BRCM_475X is not set
 # CONFIG_BT_CSR8811 is not set
 CONFIG_BT_BCM4330=y
 # CONFIG_BT_BCM4334 is not set
@@ -549,7 +545,6 @@ CONFIG_BT_MGMT=y
 # CONFIG_QC_MODEM_MDM9X15 is not set
 # CONFIG_MDM_HSIC_PM is not set
 # CONFIG_EMI_ERROR_RECOVERY is not set
-# CONFIG_SIM_DETECT is not set
 CONFIG_USB_CDFS_SUPPORT=y
 CONFIG_SAMSUNG_PRODUCT_SHIP=y
 # CONFIG_CORESIGHT_ETM is not set
@@ -606,6 +601,9 @@ CONFIG_ARM_ERRATA_754322=y
 # CONFIG_ARM_ERRATA_761171 is not set
 # CONFIG_ARM_ERRATA_762974 is not set
 # CONFIG_ARM_ERRATA_763722 is not set
+CONFIG_ARM_ERRATA_764369=y
+# CONFIG_PL310_ERRATA_769419 is not set
+# CONFIG_ARM_ERRATA_775420 is not set
 CONFIG_ARM_GIC=y
 CONFIG_PL330=y
 # CONFIG_FIQ_DEBUGGER is not set
@@ -616,8 +614,6 @@ CONFIG_PL330=y
 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_PCCARD is not set
-CONFIG_ARM_ERRATA_764369=y
-# CONFIG_PL310_ERRATA_769419 is not set
 
 #
 # Kernel Features
@@ -657,6 +653,7 @@ CONFIG_HAVE_MEMBLOCK=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_COMPACTION is not set
+# CONFIG_MIGRATION is not set
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_BOUNCE=y
@@ -668,8 +665,7 @@ CONFIG_CMA=y
 # CONFIG_CMA_DEVELOPEMENT is not set
 CONFIG_CMA_BEST_FIT=y
 # CONFIG_DEBUG_VMALLOC is not set
-# CONFIG_LOWMEM_CHECK is not set
-CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 # CONFIG_SECCOMP is not set
@@ -1226,7 +1222,6 @@ CONFIG_MISC_DEVICES=y
 # CONFIG_SENSORS_APDS990X is not set
 # CONFIG_HMC6352 is not set
 # CONFIG_SENSORS_AK8975 is not set
-# CONFIG_SENSORS_AK8963 is not set
 # CONFIG_DS1682 is not set
 # CONFIG_TI_DAC7512 is not set
 CONFIG_UID_STAT=y
@@ -1236,7 +1231,6 @@ CONFIG_UID_STAT=y
 # CONFIG_JACK_MON is not set
 # CONFIG_UART_SELECT is not set
 # CONFIG_SWITCH_DUAL_MODEM is not set
-# CONFIG_SWITCH_USB_PATH_AUTO is not set
 # CONFIG_WIMAX_CMC is not set
 CONFIG_SEC_DEV_JACK=y
 # CONFIG_MUIC_DET_JACK is not set
@@ -1289,10 +1283,10 @@ CONFIG_LINK_DEVICE_HSIC=y
 # CONFIG_WORKQUEUE_FRONT is not set
 # CONFIG_IPC_CMC22x_OLD_RFS is not set
 # CONFIG_SIPC_VER_5 is not set
+# CONFIG_SIM_DETECT is not set
 # CONFIG_SIM_SLOT_SWITCH is not set
 # CONFIG_LTE_MODEM_CMC220 is not set
 # CONFIG_INTERNAL_MODEM_IF is not set
-# CONFIG_CDMA_MODEM_QSC6085 is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1374,7 +1368,9 @@ CONFIG_WIFI_CONTROL_FUNC=y
 # CONFIG_ATH_COMMON is not set
 CONFIG_BCM4330=m
 # CONFIG_BCM4334 is not set
+# CONFIG_BCM4335 is not set
 # CONFIG_BCM43241 is not set
+CONFIG_BROADCOM_WIFI=y
 CONFIG_BCMDHD_FW_PATH="/system/etc/firmware/fw_bcmdhd.bin"
 CONFIG_BCMDHD_NVRAM_PATH="/system/etc/wifi/bcmdhd.cal"
 CONFIG_BROADCOM_WIFI_RESERVED_MEM=y
@@ -1383,7 +1379,6 @@ CONFIG_WLAN_REGION_CODE=100
 # CONFIG_IWM is not set
 # CONFIG_LIBERTAS is not set
 # CONFIG_MWIFIEX is not set
-# CONFIG_LGUIWLAN is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -1442,8 +1437,6 @@ CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_SECBRIDGE is not set
 # CONFIG_INPUT_KEYRESET is not set
 # CONFIG_INPUT_FBSUSPEND is not set
-# CONFIG_INPUT_MPU6050 is not set
-# CONFIG_INPUT_MPU6050_POLLING is not set
 
 #
 # Input Device Drivers
@@ -2087,6 +2080,7 @@ CONFIG_MALI_OSMEM_ONLY=y
 # CONFIG_VIDEO_MALI400MP_DEBUG is not set
 CONFIG_VIDEO_MALI400MP_DVFS=y
 CONFIG_VIDEO_UMP=y
+# CONFIG_UMP_R3P1_LSI is not set
 # CONFIG_UMP_DED_ONLY is not set
 CONFIG_UMP_OSMEM_ONLY=y
 # CONFIG_UMP_VCM_ONLY is not set
@@ -2429,7 +2423,6 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
 # CONFIG_USB_STORAGE_ENE_UB6250 is not set
-# CONFIG_USB_UAS is not set
 # CONFIG_USB_LIBUSUAL is not set
 
 #
@@ -2536,7 +2529,6 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_SDIO_UART is not set
 # CONFIG_MMC_TEST is not set
 # CONFIG_MMC_SELECTIVE_PACKED_CMD_POLICY is not set
-# CONFIG_MMC_CPRM is not set
 
 #
 # MMC/SD/SDIO Host Controller Drivers
@@ -2701,7 +2693,6 @@ CONFIG_MOTOR_DRV_MAX8997=y
 CONFIG_FM_RADIO=y
 CONFIG_FM_SI4709=m
 # CONFIG_FM_SI4705 is not set
-CONFIG_J4FS=m
 CONFIG_SENSORS_CORE=y
 CONFIG_SENSORS_AK8975C=y
 # CONFIG_SENSORS_AK8963C is not set
diff --git a/arch/arm/configs/cyanogenmod_i9100_defconfig b/arch/arm/configs/cyanogenmod_i9100_defconfig
index af7ff7c633a..0deaba5ae9c 100644
--- a/arch/arm/configs/cyanogenmod_i9100_defconfig
+++ b/arch/arm/configs/cyanogenmod_i9100_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/arm 3.0.31 Kernel Configuration
+# Linux/arm 3.0.64 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -182,6 +182,7 @@ CONFIG_IOSCHED_ROW=y
 CONFIG_IOSCHED_SIO=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_ROW is not set
 # CONFIG_DEFAULT_SIO is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
@@ -412,9 +413,9 @@ CONFIG_BUSFREQ=y
 # CONFIG_BUSFREQ_DEBUG is not set
 # CONFIG_BUSFREQ_L2_160M is not set
 CONFIG_SEC_THERMISTOR=y
-# CONFIG_SEC_SUBTHERMISTOR is not set
 # CONFIG_EXYNOS_SYSREG_PM is not set
 # CONFIG_ANDROID_WIP is not set
+# CONFIG_COMPACTION_RETRY is not set
 
 #
 # EXYNOS4 Machines
@@ -530,11 +531,6 @@ CONFIG_SEC_MODEM_U1=y
 # CONFIG_SEC_MODEM_P8LTE is not set
 # CONFIG_SEC_MODEM_T0_TD_DUAL is not set
 # CONFIG_SEC_MODEM_U1_SPR is not set
-
-#
-# Connectivity Feature
-#
-# CONFIG_GPS_BRCM_475X is not set
 # CONFIG_BT_CSR8811 is not set
 CONFIG_BT_BCM4330=y
 # CONFIG_BT_BCM4334 is not set
@@ -549,7 +545,6 @@ CONFIG_BT_MGMT=y
 # CONFIG_QC_MODEM_MDM9X15 is not set
 # CONFIG_MDM_HSIC_PM is not set
 # CONFIG_EMI_ERROR_RECOVERY is not set
-# CONFIG_SIM_DETECT is not set
 CONFIG_USB_CDFS_SUPPORT=y
 CONFIG_SAMSUNG_PRODUCT_SHIP=y
 # CONFIG_CORESIGHT_ETM is not set
@@ -606,6 +601,9 @@ CONFIG_ARM_ERRATA_754322=y
 # CONFIG_ARM_ERRATA_761171 is not set
 # CONFIG_ARM_ERRATA_762974 is not set
 # CONFIG_ARM_ERRATA_763722 is not set
+CONFIG_ARM_ERRATA_764369=y
+# CONFIG_PL310_ERRATA_769419 is not set
+# CONFIG_ARM_ERRATA_775420 is not set
 CONFIG_ARM_GIC=y
 CONFIG_PL330=y
 # CONFIG_FIQ_DEBUGGER is not set
@@ -616,8 +614,6 @@ CONFIG_PL330=y
 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_PCCARD is not set
-CONFIG_ARM_ERRATA_764369=y
-# CONFIG_PL310_ERRATA_769419 is not set
 
 #
 # Kernel Features
@@ -657,6 +653,7 @@ CONFIG_HAVE_MEMBLOCK=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_COMPACTION is not set
+# CONFIG_MIGRATION is not set
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_BOUNCE=y
@@ -668,8 +665,7 @@ CONFIG_CMA=y
 # CONFIG_CMA_DEVELOPEMENT is not set
 CONFIG_CMA_BEST_FIT=y
 # CONFIG_DEBUG_VMALLOC is not set
-# CONFIG_LOWMEM_CHECK is not set
-CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 # CONFIG_SECCOMP is not set
@@ -1136,6 +1132,10 @@ CONFIG_BT_HCIUART_H4=y
 #
 # Bluetooth device drivers
 #
+
+#
+# Bluetooth device drivers
+#
 # CONFIG_AF_RXRPC is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
@@ -1222,7 +1222,6 @@ CONFIG_MISC_DEVICES=y
 # CONFIG_SENSORS_APDS990X is not set
 # CONFIG_HMC6352 is not set
 # CONFIG_SENSORS_AK8975 is not set
-# CONFIG_SENSORS_AK8963 is not set
 # CONFIG_DS1682 is not set
 # CONFIG_TI_DAC7512 is not set
 CONFIG_UID_STAT=y
@@ -1232,7 +1231,6 @@ CONFIG_UID_STAT=y
 # CONFIG_JACK_MON is not set
 # CONFIG_UART_SELECT is not set
 # CONFIG_SWITCH_DUAL_MODEM is not set
-# CONFIG_SWITCH_USB_PATH_AUTO is not set
 # CONFIG_WIMAX_CMC is not set
 CONFIG_SEC_DEV_JACK=y
 # CONFIG_MUIC_DET_JACK is not set
@@ -1285,10 +1283,10 @@ CONFIG_LINK_DEVICE_HSIC=y
 # CONFIG_WORKQUEUE_FRONT is not set
 # CONFIG_IPC_CMC22x_OLD_RFS is not set
 # CONFIG_SIPC_VER_5 is not set
+# CONFIG_SIM_DETECT is not set
 # CONFIG_SIM_SLOT_SWITCH is not set
 # CONFIG_LTE_MODEM_CMC220 is not set
 # CONFIG_INTERNAL_MODEM_IF is not set
-# CONFIG_CDMA_MODEM_QSC6085 is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1368,9 +1366,11 @@ CONFIG_WLAN=y
 # CONFIG_USB_NET_RNDIS_WLAN is not set
 CONFIG_WIFI_CONTROL_FUNC=y
 # CONFIG_ATH_COMMON is not set
-CONFIG_BCM4330=m
+CONFIG_BCM4330=y
 # CONFIG_BCM4334 is not set
+# CONFIG_BCM4335 is not set
 # CONFIG_BCM43241 is not set
+CONFIG_BROADCOM_WIFI=y
 CONFIG_BCMDHD_FW_PATH="/system/etc/firmware/fw_bcmdhd.bin"
 CONFIG_BCMDHD_NVRAM_PATH="/system/etc/wifi/bcmdhd.cal"
 CONFIG_BROADCOM_WIFI_RESERVED_MEM=y
@@ -1379,7 +1379,6 @@ CONFIG_WLAN_REGION_CODE=100
 # CONFIG_IWM is not set
 # CONFIG_LIBERTAS is not set
 # CONFIG_MWIFIEX is not set
-# CONFIG_LGUIWLAN is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -1438,8 +1437,6 @@ CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_SECBRIDGE is not set
 # CONFIG_INPUT_KEYRESET is not set
 # CONFIG_INPUT_FBSUSPEND is not set
-# CONFIG_INPUT_MPU6050 is not set
-# CONFIG_INPUT_MPU6050_POLLING is not set
 
 #
 # Input Device Drivers
@@ -2079,9 +2076,11 @@ CONFIG_VIDEO_MALI400MP=y
 # CONFIG_MALI_DED_MMU is not set
 CONFIG_MALI_OSMEM_ONLY=y
 # CONFIG_MALI_DED_OSMEM is not set
+# CONFIG_MALI_R3P1_LSI is not set
 # CONFIG_VIDEO_MALI400MP_DEBUG is not set
 CONFIG_VIDEO_MALI400MP_DVFS=y
 CONFIG_VIDEO_UMP=y
+# CONFIG_UMP_R3P1_LSI is not set
 # CONFIG_UMP_DED_ONLY is not set
 CONFIG_UMP_OSMEM_ONLY=y
 # CONFIG_UMP_VCM_ONLY is not set
@@ -2423,7 +2422,6 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
 # CONFIG_USB_STORAGE_ENE_UB6250 is not set
-# CONFIG_USB_UAS is not set
 # CONFIG_USB_LIBUSUAL is not set
 
 #
@@ -2530,7 +2528,6 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_SDIO_UART is not set
 # CONFIG_MMC_TEST is not set
 # CONFIG_MMC_SELECTIVE_PACKED_CMD_POLICY is not set
-# CONFIG_MMC_CPRM is not set
 
 #
 # MMC/SD/SDIO Host Controller Drivers
@@ -2695,7 +2692,6 @@ CONFIG_MOTOR_DRV_MAX8997=y
 CONFIG_FM_RADIO=y
 CONFIG_FM_SI4709=m
 # CONFIG_FM_SI4705 is not set
-CONFIG_J4FS=m
 CONFIG_SENSORS_CORE=y
 CONFIG_SENSORS_AK8975C=y
 # CONFIG_SENSORS_AK8963C is not set
diff --git a/arch/arm/configs/cyanogenmod_n7000_defconfig b/arch/arm/configs/cyanogenmod_n7000_defconfig
index ea6f7352408..12143a68bff 100644
--- a/arch/arm/configs/cyanogenmod_n7000_defconfig
+++ b/arch/arm/configs/cyanogenmod_n7000_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/arm 3.0.31 Kernel Configuration
+# Linux/arm 3.0.64 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -186,6 +186,7 @@ CONFIG_IOSCHED_ROW=y
 CONFIG_IOSCHED_SIO=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_ROW is not set
 # CONFIG_DEFAULT_SIO is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
@@ -422,9 +423,9 @@ CONFIG_BUSFREQ_QOS_1280X800=y
 # CONFIG_BUSFREQ_DEBUG is not set
 CONFIG_BUSFREQ_L2_160M=y
 CONFIG_SEC_THERMISTOR=y
-# CONFIG_SEC_SUBTHERMISTOR is not set
 # CONFIG_EXYNOS_SYSREG_PM is not set
 # CONFIG_ANDROID_WIP is not set
+# CONFIG_COMPACTION_RETRY is not set
 
 #
 # EXYNOS4 Machines
@@ -541,11 +542,6 @@ CONFIG_SEC_MODEM_U1=y
 # CONFIG_SEC_MODEM_P8LTE is not set
 # CONFIG_SEC_MODEM_T0_TD_DUAL is not set
 # CONFIG_SEC_MODEM_U1_SPR is not set
-
-#
-# Connectivity Feature
-#
-# CONFIG_GPS_BRCM_475X is not set
 # CONFIG_BT_CSR8811 is not set
 CONFIG_BT_BCM4330=y
 # CONFIG_BT_BCM4334 is not set
@@ -560,7 +556,6 @@ CONFIG_BT_MGMT=y
 # CONFIG_QC_MODEM_MDM9X15 is not set
 # CONFIG_MDM_HSIC_PM is not set
 # CONFIG_EMI_ERROR_RECOVERY is not set
-# CONFIG_SIM_DETECT is not set
 CONFIG_USB_CDFS_SUPPORT=y
 CONFIG_SAMSUNG_PRODUCT_SHIP=y
 # CONFIG_CORESIGHT_ETM is not set
@@ -617,6 +612,9 @@ CONFIG_ARM_ERRATA_754322=y
 # CONFIG_ARM_ERRATA_761171 is not set
 # CONFIG_ARM_ERRATA_762974 is not set
 # CONFIG_ARM_ERRATA_763722 is not set
+CONFIG_ARM_ERRATA_764369=y
+# CONFIG_PL310_ERRATA_769419 is not set
+# CONFIG_ARM_ERRATA_775420 is not set
 CONFIG_ARM_GIC=y
 CONFIG_PL330=y
 # CONFIG_FIQ_DEBUGGER is not set
@@ -627,8 +625,6 @@ CONFIG_PL330=y
 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_PCCARD is not set
-CONFIG_ARM_ERRATA_764369=y
-# CONFIG_PL310_ERRATA_769419 is not set
 
 #
 # Kernel Features
@@ -669,6 +665,7 @@ CONFIG_HAVE_MEMBLOCK=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_COMPACTION is not set
+# CONFIG_MIGRATION is not set
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_BOUNCE=y
@@ -680,8 +677,7 @@ CONFIG_CMA=y
 # CONFIG_CMA_DEVELOPEMENT is not set
 CONFIG_CMA_BEST_FIT=y
 # CONFIG_DEBUG_VMALLOC is not set
-# CONFIG_LOWMEM_CHECK is not set
-CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 # CONFIG_SECCOMP is not set
@@ -1238,7 +1234,6 @@ CONFIG_MISC_DEVICES=y
 # CONFIG_SENSORS_APDS990X is not set
 # CONFIG_HMC6352 is not set
 # CONFIG_SENSORS_AK8975 is not set
-# CONFIG_SENSORS_AK8963 is not set
 # CONFIG_DS1682 is not set
 # CONFIG_TI_DAC7512 is not set
 CONFIG_UID_STAT=y
@@ -1248,7 +1243,6 @@ CONFIG_UID_STAT=y
 # CONFIG_JACK_MON is not set
 # CONFIG_UART_SELECT is not set
 # CONFIG_SWITCH_DUAL_MODEM is not set
-# CONFIG_SWITCH_USB_PATH_AUTO is not set
 # CONFIG_WIMAX_CMC is not set
 CONFIG_SEC_DEV_JACK=y
 # CONFIG_MUIC_DET_JACK is not set
@@ -1301,10 +1295,10 @@ CONFIG_LINK_DEVICE_HSIC=y
 # CONFIG_WORKQUEUE_FRONT is not set
 # CONFIG_IPC_CMC22x_OLD_RFS is not set
 # CONFIG_SIPC_VER_5 is not set
+# CONFIG_SIM_DETECT is not set
 # CONFIG_SIM_SLOT_SWITCH is not set
 # CONFIG_LTE_MODEM_CMC220 is not set
 # CONFIG_INTERNAL_MODEM_IF is not set
-# CONFIG_CDMA_MODEM_QSC6085 is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1386,7 +1380,9 @@ CONFIG_WIFI_CONTROL_FUNC=y
 # CONFIG_ATH_COMMON is not set
 CONFIG_BCM4330=m
 # CONFIG_BCM4334 is not set
+# CONFIG_BCM4335 is not set
 # CONFIG_BCM43241 is not set
+CONFIG_BROADCOM_WIFI=y
 CONFIG_BCMDHD_FW_PATH="/system/etc/firmware/fw_bcmdhd.bin"
 CONFIG_BCMDHD_NVRAM_PATH="/system/etc/wifi/bcmdhd.cal"
 CONFIG_BROADCOM_WIFI_RESERVED_MEM=y
@@ -1395,7 +1391,6 @@ CONFIG_WLAN_REGION_CODE=100
 # CONFIG_IWM is not set
 # CONFIG_LIBERTAS is not set
 # CONFIG_MWIFIEX is not set
-# CONFIG_LGUIWLAN is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -1454,8 +1449,6 @@ CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_SECBRIDGE is not set
 # CONFIG_INPUT_KEYRESET is not set
 # CONFIG_INPUT_FBSUSPEND is not set
-# CONFIG_INPUT_MPU6050 is not set
-# CONFIG_INPUT_MPU6050_POLLING is not set
 
 #
 # Input Device Drivers
@@ -2099,6 +2092,7 @@ CONFIG_MALI_OSMEM_ONLY=y
 # CONFIG_VIDEO_MALI400MP_DEBUG is not set
 CONFIG_VIDEO_MALI400MP_DVFS=y
 CONFIG_VIDEO_UMP=y
+# CONFIG_UMP_R3P1_LSI is not set
 # CONFIG_UMP_DED_ONLY is not set
 CONFIG_UMP_OSMEM_ONLY=y
 # CONFIG_UMP_VCM_ONLY is not set
@@ -2197,9 +2191,7 @@ CONFIG_FB_S5P_S6E8AA0=y
 # CONFIG_FB_S5P_S6D6AA1 is not set
 CONFIG_S6E8AA0_AMS529HA01=y
 # CONFIG_S6E8AA0_AMS480GYXX is not set
-# CONFIG_S6E8AA0_AMS465XX is not set
 # CONFIG_AID_DIMMING is not set
-# CONFIG_LCD_REVERSE is not set
 # CONFIG_FB_S5P_EXTDSP is not set
 # CONFIG_S5P_DSIM_SWITCHABLE_DUAL_LCD is not set
 # CONFIG_FB_S1D13XXX is not set
@@ -2449,7 +2441,6 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
 # CONFIG_USB_STORAGE_ENE_UB6250 is not set
-# CONFIG_USB_UAS is not set
 # CONFIG_USB_LIBUSUAL is not set
 
 #
@@ -2556,7 +2547,6 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_SDIO_UART is not set
 # CONFIG_MMC_TEST is not set
 # CONFIG_MMC_SELECTIVE_PACKED_CMD_POLICY is not set
-# CONFIG_MMC_CPRM is not set
 
 #
 # MMC/SD/SDIO Host Controller Drivers
@@ -2721,7 +2711,6 @@ CONFIG_MOTOR_DRV_MAX8997=y
 CONFIG_FM_RADIO=y
 CONFIG_FM_SI4709=m
 # CONFIG_FM_SI4705 is not set
-CONFIG_J4FS=m
 CONFIG_SENSORS_CORE=y
 CONFIG_SENSORS_AK8975C=y
 # CONFIG_SENSORS_AK8963C is not set