smdk4412 : kona devices : new defconfig

Change-Id: Iafe4ac15a4c198e3c016ab40fc6d631999c5bdaf

3 files changed, 356 insertions, 359 deletions

diff --git a/arch/arm/configs/cyanogenmod_n5100_defconfig b/arch/arm/configs/cyanogenmod_n5100_defconfig
index 57d3ef0ce87..16096f51741 100644
--- a/arch/arm/configs/cyanogenmod_n5100_defconfig
+++ b/arch/arm/configs/cyanogenmod_n5100_defconfig
@@ -70,6 +70,7 @@ CONFIG_GENERIC_IRQ_CHIP=y
 # RCU Subsystem
 #
 CONFIG_TREE_PREEMPT_RCU=y
+# CONFIG_TINY_RCU is not set
 CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
@@ -107,6 +108,7 @@ CONFIG_RD_GZIP=y
 # CONFIG_RD_LZMA is not set
 # CONFIG_RD_XZ is not set
 # CONFIG_RD_LZO is not set
+# CONFIG_RD_LZ4 is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_CC_CHECK_WARNING_STRICTLY is not set
 CONFIG_SYSCTL=y
@@ -189,6 +191,8 @@ 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"
 # CONFIG_INLINE_SPIN_TRYLOCK is not set
@@ -219,7 +223,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_INLINE_WRITE_UNLOCK_BH is not set
 # CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
 # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-CONFIG_MUTEX_SPIN_ON_OWNER=y
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
 CONFIG_FREEZER=y
 
 #
@@ -355,6 +359,7 @@ CONFIG_S5P_DEV_USB_EHCI=y
 CONFIG_S5P_DEV_FIMD_S5P=y
 CONFIG_S5P_DEV_USBGADGET=y
 CONFIG_S5P_MEM_CMA=y
+CONFIG_S5P_DEV_MIPI_DSI=y
 # CONFIG_S5P_BTS is not set
 # CONFIG_S3C_DEV_TSI is not set
 CONFIG_ARCH_EXYNOS4=y
@@ -369,7 +374,6 @@ CONFIG_EXYNOS4_LOWPWR_IDLE=y
 CONFIG_EXYNOS_MCT=y
 CONFIG_EXYNOS_DEV_PD=y
 CONFIG_EXYNOS4_DEV_FIMC_LITE=y
-CONFIG_EXYNOS4_DEV_FIMC_IS=y
 CONFIG_EXYNOS4_SETUP_I2C1=y
 CONFIG_EXYNOS4_SETUP_I2C3=y
 CONFIG_EXYNOS4_SETUP_I2C4=y
@@ -385,13 +389,13 @@ CONFIG_EXYNOS4_SETUP_FIMC0=y
 CONFIG_EXYNOS4_SETUP_FIMC1=y
 CONFIG_EXYNOS4_SETUP_FIMC2=y
 CONFIG_EXYNOS4_SETUP_FIMC3=y
-CONFIG_EXYNOS4_SETUP_FIMC_IS=y
 CONFIG_EXYNOS4_SETUP_USB_PHY=y
 CONFIG_EXYNOS4_SETUP_CSIS=y
 CONFIG_EXYNOS4_SETUP_FB_S5P=y
 CONFIG_EXYNOS4_SETUP_TVOUT=y
 CONFIG_EXYNOS4_SETUP_THERMAL=y
 # CONFIG_EXYNOS_SETUP_THERMAL is not set
+CONFIG_EXYNOS4_SETUP_MIPI_DSI=y
 CONFIG_EXYNOS4_SETUP_JPEG=y
 CONFIG_EXYNOS4_ENABLE_CLOCK_DOWN=y
 CONFIG_EXYNOS4_CPUFREQ=y
@@ -420,7 +424,6 @@ CONFIG_BUSFREQ_QOS_1280X800=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=y
 # CONFIG_COMPACTION_RETRY is not set
@@ -449,6 +452,11 @@ CONFIG_TARGET_LOCALE_EUR=y
 # CONFIG_TARGET_LOCALE_JPN is not set
 # CONFIG_TARGET_LOCALE_CHN is not set
 # CONFIG_TARGET_LOCALE_USA is not set
+CONFIG_MACH_KONA_EUR_OPEN=y
+# CONFIG_MACH_KONA_EUR_WIFI is not set
+# CONFIG_MACH_KONA_EUR_LTE is not set
+# CONFIG_MACH_KONALTE_USA_ATT is not set
+# CONFIG_MACH_KONA_KOR_WIFI is not set
 # CONFIG_MACH_SMDK4X12 is not set
 CONFIG_MACH_MIDAS=y
 # CONFIG_MACH_M0 is not set
@@ -458,7 +466,6 @@ CONFIG_MACH_MIDAS=y
 # CONFIG_MACH_GC1 is not set
 # CONFIG_MACH_T0 is not set
 CONFIG_MACH_KONA=y
-CONFIG_MACH_KONA_SENSOR=y
 # CONFIG_MACH_IRON is not set
 # CONFIG_MACH_GRANDE is not set
 # CONFIG_MACH_BAFFIN is not set
@@ -471,21 +478,12 @@ CONFIG_MACH_KONA_SENSOR=y
 CONFIG_KONA_01_BD=y
 # CONFIG_IRON_BD is not set
 # CONFIG_GRANDE_BD is not set
-# CONFIG_SLP is not set
-# CONFIG_MACH_REDWOOD is not set
-# CONFIG_GPS_BCM47511 is not set
-CONFIG_GPS_BCM4752=y
-# CONFIG_GPS_GSD4T is not set
-# CONFIG_GPIO_NAPLES_00_BD is not set
-# CONFIG_SLP_DISP_DEBUG is not set
-# CONFIG_EXYNOS4_DEV_TMU is not set
-# CONFIG_BT_TIZEN is not set
 # CONFIG_WRITEBACK_ENABLED is not set
 CONFIG_EXYNOS_SOUND_PLATFORM_DATA=y
-CONFIG_USE_ADC_DET=y
 # CONFIG_JACK_FET is not set
 # CONFIG_JACK_GROUND_DET is not set
-# CONFIG_SAMSUNG_ANALOG_UART_SWITCH is not set
+CONFIG_USE_ADC_DET=y
+CONFIG_SAMSUNG_ANALOG_UART_SWITCH=1
 # CONFIG_EXYNOS5_DEV_BTS is not set
 
 #
@@ -522,6 +520,7 @@ CONFIG_EXYNOS4_MSHC_DDR=y
 #
 CONFIG_SEC_DEBUG=y
 CONFIG_SEC_DEBUG_SCHED_LOG=y
+# CONFIG_SEC_DEBUG_HRTIMER_LOG is not set
 # CONFIG_SEC_DEBUG_SOFTIRQ_LOG is not set
 CONFIG_SEC_DEBUG_SCHED_LOG_NONCACHED=y
 # CONFIG_SEC_DEBUG_SEMAPHORE_LOG is not set
@@ -538,6 +537,7 @@ CONFIG_SEC_LOG=y
 CONFIG_SEC_LOG_NONCACHED=y
 CONFIG_SEC_LOG_LAST_KMSG=y
 CONFIG_EHCI_IRQ_DISTRIBUTION=y
+CONFIG_EHCI_MODEM_PORTNUM=2
 
 #
 # Samsung Modem Feature
@@ -576,14 +576,15 @@ CONFIG_BT_MGMT=y
 # Qualcomm Modem Feature
 #
 # CONFIG_QC_MODEM is not set
-# CONFIG_CPU_FREQ_TETHERING is not set
 # CONFIG_MSM_SUBSYSTEM_RESTART is not set
 # 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 is not set
 # CONFIG_CORESIGHT_ETM is not set
+CONFIG_MACH_KONA_SENSOR=y
 
 #
 # Processor Type
@@ -638,6 +639,9 @@ CONFIG_ARM_ERRATA_761320=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
@@ -648,8 +652,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
@@ -698,12 +700,12 @@ CONFIG_VIRT_TO_BUS=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_CLEANCACHE is not set
+# CONFIG_ZSMALLOC is not set
 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
@@ -754,6 +756,7 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
 # CONFIG_CPU_FREQ_GOV_ADAPTIVE is not set
 CONFIG_CPU_FREQ_GOV_PEGASUSQ=y
+# CONFIG_CPU_FREQ_GOV_PEGASUSQ_BOOST is not set
 # CONFIG_CPU_FREQ_GOV_SLP is not set
 CONFIG_CPU_FREQ_DVFS_MONITOR=y
 CONFIG_CPU_IDLE=y
@@ -805,6 +808,7 @@ CONFIG_ARCH_HAS_OPP=y
 CONFIG_PM_OPP=y
 CONFIG_PM_RUNTIME_CLK=y
 # CONFIG_SUSPEND_TIME is not set
+CONFIG_CPU_PM=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_NET=y
 
@@ -847,6 +851,8 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
+# CONFIG_DEFAULT_CUBIC is not set
+# CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
@@ -1193,6 +1199,7 @@ CONFIG_WIRELESS_EXT_SYSFS=y
 # CONFIG_LIB80211 is not set
 # CONFIG_CFG80211_ALLOW_RECONNECT is not set
 # CONFIG_MAC80211 is not set
+# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
 # CONFIG_WIMAX is not set
 CONFIG_RFKILL=y
 CONFIG_RFKILL_PM=y
@@ -1206,6 +1213,14 @@ CONFIG_RFKILL_PM=y
 #
 # Device Drivers
 #
+CONFIG_MALI400=y
+CONFIG_MALI_VER_R3P2=y
+# CONFIG_MALI400_DEBUG is not set
+# CONFIG_MALI400_PROFILING is not set
+CONFIG_MALI_DVFS=y
+CONFIG_MALI400_UMP=y
+# CONFIG_MALI_SHARED_INTERRUPTS is not set
+# CONFIG_UMP_DEBUG is not set
 
 #
 # Generic Driver Options
@@ -1261,7 +1276,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
@@ -1271,19 +1285,24 @@ 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 is not set
 # CONFIG_MUIC_DET_JACK is not set
 # CONFIG_FM34_WE395 is not set
 # CONFIG_AUDIENCE_ES305 is not set
 # CONFIG_2MIC_FM34_WE395 is not set
+# CONFIG_MUIC_MAX77693_SEPARATE_MHL_PORT is not set
+CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK=y
+CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK=y
+# CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK is not set
 # CONFIG_USBHUB_USB3503 is not set
 # CONFIG_USBHUB_USB3503_OTG_CONN is not set
 # CONFIG_USBHUB_USB3803 is not set
 # CONFIG_PN544 is not set
+# CONFIG_STMPE811_ADC is not set
 # CONFIG_MPU_SENSORS_MPU3050 is not set
 # CONFIG_MPU_SENSORS_MPU6050 is not set
+CONFIG_UID_CPUTIME=y
 # CONFIG_C2PORT is not set
 
 #
@@ -1308,10 +1327,13 @@ CONFIG_SEC_MODEM=y
 CONFIG_UMTS_MODEM_XMM6262=y
 # CONFIG_CDMA_MODEM_CBP71 is not set
 # CONFIG_CDMA_MODEM_CBP72 is not set
+# CONFIG_CDMA_MODEM_CBP82 is not set
 # CONFIG_LTE_MODEM_CMC221 is not set
+# CONFIG_UMTS_MODEM_SS222 is not set
 # CONFIG_CDMA_MODEM_MDM6600 is not set
 # CONFIG_TDSCDMA_MODEM_SPRD8803 is not set
 # CONFIG_GSM_MODEM_ESC6270 is not set
+# CONFIG_CDMA_MODEM_QSC6085 is not set
 # CONFIG_LINK_DEVICE_MIPI is not set
 # CONFIG_LINK_DEVICE_DPRAM is not set
 # CONFIG_LINK_DEVICE_PLD is not set
@@ -1319,13 +1341,13 @@ CONFIG_UMTS_MODEM_XMM6262=y
 CONFIG_LINK_DEVICE_HSIC=y
 # CONFIG_LINK_DEVICE_C2C is not set
 # CONFIG_LINK_DEVICE_SPI is not set
+# CONFIG_BOOT_DEVICE_SPI is not set
 # CONFIG_WORKQUEUE_FRONT is not set
 # CONFIG_IPC_CMC22x_OLD_RFS is not set
 # CONFIG_SIPC_VER_5 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
 
@@ -1406,9 +1428,16 @@ CONFIG_WLAN=y
 # CONFIG_USB_NET_RNDIS_WLAN is not set
 CONFIG_WIFI_CONTROL_FUNC=y
 # CONFIG_ATH_COMMON is not set
+# CONFIG_B43LEGACY_DMA_AND_PIO_MODE is not set
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
 # CONFIG_BCM4330 is not set
 CONFIG_BCM4334=m
+# CONFIG_BCM4335 is not set
+# CONFIG_BCM4339 is not set
+# CONFIG_BCM4354 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
@@ -1417,7 +1446,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
@@ -1479,8 +1507,6 @@ CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_SECBRIDGE is not set
 CONFIG_INPUT_KEYRESET=y
 # CONFIG_INPUT_FBSUSPEND is not set
-# CONFIG_INPUT_MPU6050 is not set
-# CONFIG_INPUT_MPU6050_POLLING is not set
 
 #
 # Input Device Drivers
@@ -1504,7 +1530,9 @@ CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_SENSORS_HALL=y
 # CONFIG_KEYBOARD_CYPRESS_TOUCH is not set
+# CONFIG_KEYBOARD_CYPRESS_TOUCH_BLN is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
@@ -1562,7 +1590,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_S7301=y
 CONFIG_TOUCHSCREEN_SYNAPTICS_S7301_KEYS=y
 CONFIG_TOUCHSCREEN_SYNAPTICS_S7301_WORKAROUND=y
 CONFIG_TOUCHSCREEN_SYNAPTICS_S7301_KEYLED=y
-# CONFIG_TOUCHSCREEN_CYPRESS_TMA46X is not set
+# CONFIG_TOUCHSCREEN_CYTTSP4 is not set
 CONFIG_SEC_TOUCHSCREEN_DVFS_LOCK=y
 CONFIG_SEC_TOUCHSCREEN_SURFACE_TOUCH=y
 # CONFIG_KEYPAD_MELFAS_TOUCH is not set
@@ -1570,27 +1598,6 @@ CONFIG_SEC_TOUCHSCREEN_SURFACE_TOUCH=y
 CONFIG_INPUT_WACOM=y
 # CONFIG_EPEN_WACOM_G5SP is not set
 # CONFIG_EPEN_WACOM_G9PM is not set
-CONFIG_EPEN_WACOM_G9PL=y
-# CONFIG_RMI4_DEBUG is not set
-# CONFIG_RMI4_BUS is not set
-# CONFIG_RMI4_GENERIC is not set
-# CONFIG_RMI4_F09 is not set
-# CONFIG_RMI4_F1A is not set
-# CONFIG_RMI4_F11 is not set
-# CONFIG_RMI4_VIRTUAL_BUTTONS is not set
-# CONFIG_RMI4_F17 is not set
-# CONFIG_RMI4_F19 is not set
-# CONFIG_RMI4_F21 is not set
-# CONFIG_RMI4_F30 is not set
-# CONFIG_RMI4_F31 is not set
-# CONFIG_RMI4_F34 is not set
-# CONFIG_RMI4_F41 is not set
-# CONFIG_RMI4_F54 is not set
-# CONFIG_RMI4_SMB is not set
-# CONFIG_RMI4_I2C is not set
-# CONFIG_RMI4_SPI is not set
-# CONFIG_RMI4_DEV is not set
-# CONFIG_RMI4_FWLIB is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_SENSORS_BH1721FVC is not set
 # CONFIG_INPUT_AD714X is not set
@@ -1613,7 +1620,6 @@ CONFIG_INPUT_GPIO=y
 # CONFIG_INPUT_FLIP is not set
 # CONFIG_INPUT_KR3DH is not set
 
-
 #
 # Hardware I/O ports
 #
@@ -1825,10 +1831,15 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_BATTERY_MAX17042_FUELGAUGE is not set
 # CONFIG_BATTERY_MAX17047_FUELGAUGE is not set
 CONFIG_BATTERY_MAX17047_C_FUELGAUGE=y
-CONFIG_BATTERY_MAX77693_CHARGER=y
 # CONFIG_BATTERY_SMB136_CHARGER is not set
+CONFIG_BATTERY_MAX77693_CHARGER=y
+# CONFIG_BATTERY_WPC_CHARGER is not set
 # CONFIG_BATTERY_SAMSUNG_P1X is not set
+# CONFIG_FUELGAUGE_DUMMY is not set
+# CONFIG_FUELGAUGE_MAX17048 is not set
+# CONFIG_CHARGER_DUMMY is not set
 # CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_SMB328 is not set
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PDA_POWER is not set
 # CONFIG_TEST_POWER is not set
@@ -1851,16 +1862,13 @@ CONFIG_BATTERY_SAMSUNG=y
 # CONFIG_SMB328_CHARGER is not set
 # CONFIG_SMB347_CHARGER is not set
 # CONFIG_CHARGER_MANAGER is not set
-CONFIG_SAMSUNG_LPM_MODE=y
 # CONFIG_HWMON is not set
 CONFIG_THERMAL=y
 # CONFIG_CPU_THERMAL is not set
 # CONFIG_SENSORS_EXYNOS4_TMU is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
-# CONFIG_CHARGER_NCP1851 is not set
-# CONFIG_FUELGAUGE_MAX17050 is not set
-# CONFIG_FUELGAUGE_MAX17050_COULOMB_COUNTING is not set
+
 #
 # Watchdog Device Drivers
 #
@@ -2056,12 +2064,6 @@ CONFIG_VIDEO_IR_I2C=y
 # CONFIG_VIDEO_TVP5150 is not set
 # CONFIG_VIDEO_TVP7002 is not set
 # CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_S5K3H2 is not set
-# CONFIG_VIDEO_S5K3H7 is not set
-# CONFIG_VIDEO_S5K4E5 is not set
-# CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_S5K6A3_CSI_C is not set
-# CONFIG_S5K6A3_CSI_D is not set
 # CONFIG_VIDEO_M5MO is not set
 # CONFIG_VIDEO_M9MO is not set
 # CONFIG_VIDEO_S5K5BAFX is not set
@@ -2069,12 +2071,12 @@ CONFIG_VIDEO_IR_I2C=y
 # CONFIG_VIDEO_SR200PC20 is not set
 # CONFIG_VIDEO_SR200PC20M is not set
 CONFIG_VIDEO_ISX012=y
-CONFIG_VIDEO_SR130PC20=y
 # CONFIG_VIDEO_SLP_S5K4ECGX is not set
 # CONFIG_VIDEO_SLP_DB8131M is not set
 # CONFIG_VIDEO_S5K4EA is not set
 # CONFIG_VIDEO_S5C73M3 is not set
 # CONFIG_VIDEO_SLP_S5C73M3 is not set
+CONFIG_VIDEO_SR130PC20=y
 CONFIG_VIDEO_IMPROVE_STREAMOFF=y
 
 #
@@ -2141,7 +2143,6 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_USB_ZR364XX is not set
 # CONFIG_USB_STKWEBCAM is not set
 # CONFIG_USB_S2255 is not set
-CONFIG_MALI_400MP_UMP=y
 CONFIG_VIDEO_SAMSUNG=y
 CONFIG_VIDEO_SAMSUNG_V4L2=y
 CONFIG_VIDEO_FIMC=y
@@ -2170,6 +2171,8 @@ CONFIG_LSI_HDMI_AUDIO_CH_EVENT=y
 CONFIG_VIDEO_MFC5X=y
 CONFIG_VIDEO_MFC_MAX_INSTANCE=4
 # CONFIG_VIDEO_MFC5X_DEBUG is not set
+# CONFIG_VIDEO_MALI400MP is not set
+# CONFIG_VIDEO_UMP is not set
 CONFIG_VIDEO_FIMG2D=y
 # CONFIG_VIDEO_FIMG2D_DEBUG is not set
 CONFIG_VIDEO_FIMG2D4X=y
@@ -2191,20 +2194,10 @@ CONFIG_VIDEO_SAMSUNG_MEMSIZE_JPEG=0
 CONFIG_VIDEO_SAMSUNG_MEMSIZE_TVOUT=0
 CONFIG_VIDEO_EXYNOS=y
 CONFIG_VIDEO_EXYNOS_MEMSIZE_FIMC_IS=12288
-CONFIG_EXYNOS_MEDIA_DEVICE=y
-# CONFIG_VIDEO_EXYNOS_FIMC_LITE  is not set
-
-#
-# Reserved memory configurations
-#
-CONFIG_VIDEO_SAMSUNG_MEMSIZE_FLITE0=10240
-CONFIG_VIDEO_SAMSUNG_MEMSIZE_FLITE1=10240
-# CONFIG_VIDEO_EXYNOS_MIPI_CSIS is not set
+# CONFIG_VIDEO_EXYNOS_FIMC_LITE is not set
 # CONFIG_VIDEO_EXYNOS_TV is not set
 # CONFIG_VIDEO_EXYNOS_ROTATOR is not set
-# CONFIG_VIDEO_EXYNOS_FIMC_IS  is not set
-# CONFIG_VIDEO_EXYNOS_FIMC_IS_BAYER is not set
-CONFIG_MEDIA_EXYNOS=y
+# CONFIG_VIDEO_EXYNOS_FIMC_IS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
 
@@ -2221,29 +2214,14 @@ CONFIG_SAMSUNG_WORKAROUND_HPD_GLANCE=y
 # CONFIG_ISDBT is not set
 
 #
-# MUIC device
-#
-# CONFIG_STMPE811_ADC is not set
-CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK=y
-CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK=y
-
-#
 # Graphics support
 #
-# CONFIG_MALI_VER_BEFORE_R3P2 is not set
 # CONFIG_DRM is not set
 CONFIG_ION=y
 CONFIG_ION_EXYNOS=y
 CONFIG_ION_EXYNOS_CONTIGHEAP_SIZE=81920
 # CONFIG_ION_EXYNOS_CONTIGHEAP_DEBUG is not set
-# CONFIG_VITHAR is not set
-CONFIG_MALI400=y
-CONFIG_MALI_VER_R3P2=y
-# CONFIG_MALI400_DEBUG is not set
-# CONFIG_MALI400_PROFILING is not set
-CONFIG_MALI_DVFS=y
-CONFIG_MALI400_UMP=y
-# CONFIG_MALI_SHARED_INTERRUPTS is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
@@ -2274,6 +2252,7 @@ CONFIG_FB_S5P_SPLASH_SCREEN=y
 # CONFIG_FB_S5P_LCD_INIT is not set
 # CONFIG_FB_S5P_DEBUG is not set
 CONFIG_FB_S5P_VSYNC_THREAD=y
+# CONFIG_FB_S5P_VSYNC_SEND_UEVENTS is not set
 CONFIG_FB_S5P_VSYNC_SYSFS=y
 # CONFIG_FB_S5P_TRACE_UNDERRUN is not set
 CONFIG_FB_S5P_DEFAULT_WINDOW=3
@@ -2282,12 +2261,18 @@ CONFIG_FB_S5P_NR_BUFFERS=2
 CONFIG_VIDEO_SAMSUNG_MEMSIZE_FIMD=8192
 CONFIG_FB_S5P_MDNIE=y
 CONFIG_FB_MDNIE_PWM=y
-CONFIG_FB_EBOOK_PANEL_SCENARIO=y
 CONFIG_FB_S5P_MIPI_DSIM=y
 CONFIG_FB_BGRA_ORDER=y
 # CONFIG_FB_RGBA_ORDER is not set
 # CONFIG_FB_S5P_S6C1372 is not set
 # CONFIG_FB_S5P_LD9040 is not set
+# CONFIG_FB_S5P_LMS501XX is not set
+# CONFIG_FB_S5P_DUMMY_MIPI_LCD is not set
+# CONFIG_FB_S5P_S6E8AA0 is not set
+# CONFIG_FB_S5P_EA8061 is not set
+# CONFIG_FB_S5P_S6EVR02 is not set
+# CONFIG_FB_S5P_S6D6AA1 is not set
+# CONFIG_FB_S5P_S6E63M0 is not set
 CONFIG_FB_S5P_NT71391=y
 # CONFIG_LCD_FREQ_SWITCH is not set
 CONFIG_FB_S5P_EXTDSP=y
@@ -2296,10 +2281,10 @@ CONFIG_FB_S5P_EXTDSP_NR_BUFFERS=3
 # CONFIG_S5P_DSIM_SWITCHABLE_DUAL_LCD is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_TMIO is not set
-# CONFIG_S5P_MIPI_DSI2 is not set
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX_PCI_GDC is not set
 # CONFIG_FB_BROADSHEET is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
@@ -2351,7 +2336,6 @@ CONFIG_SND_JACK=y
 # CONFIG_SND_VERBOSE_PROCFS is not set
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
-# CONFIG_SND_DEBUG_VERBOSE is not set
 # CONFIG_SND_RAWMIDI_SEQ is not set
 # CONFIG_SND_OPL3_LIB_SEQ is not set
 # CONFIG_SND_OPL4_LIB_SEQ is not set
@@ -2369,6 +2353,7 @@ CONFIG_SND_SOC=y
 # CONFIG_SND_SOC_CACHE_LZO is not set
 CONFIG_SND_SOC_SAMSUNG=y
 CONFIG_SND_SAMSUNG_I2S=y
+# CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811 is not set
 CONFIG_SND_SOC_SAMSUNG_KONA_WM1811=y
 # CONFIG_SND_SOC_SAMSUNG_USE_DMA_WRAPPER is not set
 CONFIG_SND_SOC_SAMSUNG_I2S_SEC=y
@@ -2406,7 +2391,6 @@ CONFIG_USB_HID=y
 #
 # Special HID drivers
 #
-CONFIG_UHID=y
 CONFIG_HID_A4TECH=y
 CONFIG_HID_ACRUX=y
 # CONFIG_HID_ACRUX_FF is not set
@@ -2552,7 +2536,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
 
 #
@@ -2654,6 +2637,12 @@ CONFIG_USB_GADGET_SELECTED=y
 CONFIG_USB_GADGET_S3C_OTGD=y
 # CONFIG_USB_GADGET_PXA_U2O is not set
 # CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_CI13XXX_PCI is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LANGWELL is not set
+# CONFIG_USB_GADGET_EG20T is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 
 #
@@ -2750,12 +2739,14 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_LT3593 is not set
 # CONFIG_LEDS_SWITCH is not set
+# CONFIG_LEDS_MAX77693 is not set
 # CONFIG_LEDS_AAT1290A is not set
 # CONFIG_LEDS_TRIGGERS is not set
 
 #
 # LED Triggers
 #
+# CONFIG_LEDS_TRIGGER_NOTIFICATION is not set
 # CONFIG_NFC_DEVICES is not set
 CONFIG_SWITCH=y
 CONFIG_SWITCH_GPIO=y
@@ -2868,14 +2859,14 @@ CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL=0x11d
 CONFIG_ANDROID_TIMED_OUTPUT=y
 # CONFIG_ANDROID_TIMED_GPIO is not set
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
+CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
+CONFIG_ANDROID_LMK_ADJ_RBTREE=y
 # CONFIG_POHMELFS is not set
 # CONFIG_LINE6_USB is not set
 # CONFIG_USB_SERIAL_QUATECH2 is not set
 # CONFIG_USB_SERIAL_QUATECH_USB2 is not set
 # CONFIG_VT6656 is not set
 # CONFIG_IIO is not set
-# CONFIG_XVMALLOC is not set
-# CONFIG_ZRAM is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_LIRC_STAGING is not set
 # CONFIG_EASYCAP is not set
@@ -2901,7 +2892,6 @@ CONFIG_CLKDEV_LOOKUP=y
 CONFIG_VIBETONZ=y
 CONFIG_MOTOR_DRV_MAX77693=y
 # CONFIG_MOTOR_DRV_ISA1200 is not set
-# CONFIG_MOTOR_DRV_DRV2603 is not set
 # CONFIG_FM_RADIO is not set
 CONFIG_SENSORS_CORE=y
 # CONFIG_SENSORS_AK8975C is not set
@@ -2909,10 +2899,7 @@ CONFIG_SENSORS_CORE=y
 # CONFIG_SENSORS_BMP180 is not set
 # CONFIG_SENSORS_CM3663 is not set
 # CONFIG_SENSORS_PAS2M110 is not set
-CONFIG_INPUT_YAS_MAGNETOMETER_POSITION=2
 # CONFIG_SENSORS_BMA254 is not set
-CONFIG_SENSORS_YAS532=y
-CONFIG_SENSORS_YAS_ORI=y
 # CONFIG_SENSORS_TAOS is not set
 CONFIG_SENSORS_GP2A=y
 # CONFIG_SENSORS_GP2A_ANALOG is not set
@@ -2925,6 +2912,9 @@ CONFIG_SENSOR_K3DH_INPUTDEV=y
 # CONFIG_SENSORS_K3G is not set
 # CONFIG_SENSORS_LSM330DLC is not set
 # CONFIG_SENSORS_LPS331 is not set
+CONFIG_SENSORS_YAS532=y
+CONFIG_SENSORS_YAS_ORI=y
+CONFIG_INPUT_YAS_MAGNETOMETER_POSITION=2
 # CONFIG_SENSORS_SYSFS is not set
 # CONFIG_SENSORS_SSP is not set
 # CONFIG_SENSORS_SSP_LSM330 is not set
@@ -2946,13 +2936,13 @@ CONFIG_IR_REMOCON=y
 CONFIG_IR_REMOCON_MC96=y
 # CONFIG_EXTCON is not set
 # CONFIG_BARCODE_EMUL is not set
+# CONFIG_SAMSUNG_PHONE_TTY is not set
 CONFIG_MOBICORE_SUPPORT=y
 # CONFIG_MOBICORE_DEBUG is not set
 CONFIG_MOBICORE_API=y
 CONFIG_IOMMU_SUPPORT=y
 # CONFIG_FELICA is not set
 # CONFIG_AUTHENTEC_VPNCLIENT_INTERCEPTOR is not set
-# CONFIG_J4FS is not set
 
 #
 # File systems
@@ -2969,6 +2959,7 @@ CONFIG_EXT4_FS_SECURITY=y
 # CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_XFS_FS is not set
@@ -3031,6 +3022,10 @@ CONFIG_WTL_ENCRYPTION_FILTER=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+# CONFIG_JFFS2_CMODE_PRIORITY is not set
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
 # CONFIG_LOGFS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_SQUASHFS is not set
@@ -3040,9 +3035,13 @@ CONFIG_WTL_ENCRYPTION_FILTER=y
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
+# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
 # CONFIG_PSTORE is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
+# CONFIG_F2FS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
@@ -3140,7 +3139,6 @@ CONFIG_NLS_UTF8=y
 #
 CONFIG_PRINTK_TIME=y
 CONFIG_PRINTK_CPU_ID=y
-CONFIG_UID_CPUTIME=y
 # CONFIG_PRINTK_PID is not set
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 CONFIG_ENABLE_WARN_DEPRECATED=y
@@ -3286,6 +3284,9 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_IMA is not set
 CONFIG_DEFAULT_SECURITY_SELINUX=y
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 # CONFIG_DEFAULT_SECURITY_DAC is not set
 CONFIG_DEFAULT_SECURITY="selinux"
 CONFIG_CRYPTO=y
@@ -3386,6 +3387,8 @@ CONFIG_CRYPTO_TWOFISH_COMMON=y
 CONFIG_CRYPTO_DEFLATE=y
 # CONFIG_CRYPTO_ZLIB is not set
 # CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_LZ4 is not set
+# CONFIG_CRYPTO_LZ4HC is not set
 
 #
 # Random Number Generation
@@ -3415,6 +3418,9 @@ CONFIG_ZLIB_DEFLATE=y
 # CONFIG_XZ_DEC_BCJ is not set
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=y
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=y
 CONFIG_TEXTSEARCH_BM=y
@@ -3424,5 +3430,3 @@ CONFIG_HAS_DMA=y
 CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
 # CONFIG_AVERAGE is not set
-
-CONFIG_SENSORS_HALL=y
diff --git a/arch/arm/configs/cyanogenmod_n5110_defconfig b/arch/arm/configs/cyanogenmod_n5110_defconfig
index 1000a703ff6..c5e7be1ad02 100644
--- a/arch/arm/configs/cyanogenmod_n5110_defconfig
+++ b/arch/arm/configs/cyanogenmod_n5110_defconfig
@@ -70,6 +70,7 @@ CONFIG_GENERIC_IRQ_CHIP=y
 # RCU Subsystem
 #
 CONFIG_TREE_PREEMPT_RCU=y
+# CONFIG_TINY_RCU is not set
 CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
@@ -107,6 +108,7 @@ CONFIG_RD_GZIP=y
 # CONFIG_RD_LZMA is not set
 # CONFIG_RD_XZ is not set
 # CONFIG_RD_LZO is not set
+# CONFIG_RD_LZ4 is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_CC_CHECK_WARNING_STRICTLY is not set
 CONFIG_SYSCTL=y
@@ -189,6 +191,8 @@ 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"
 # CONFIG_INLINE_SPIN_TRYLOCK is not set
@@ -219,7 +223,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_INLINE_WRITE_UNLOCK_BH is not set
 # CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
 # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-CONFIG_MUTEX_SPIN_ON_OWNER=y
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
 CONFIG_FREEZER=y
 
 #
@@ -355,6 +359,7 @@ CONFIG_S5P_DEV_USB_EHCI=y
 CONFIG_S5P_DEV_FIMD_S5P=y
 CONFIG_S5P_DEV_USBGADGET=y
 CONFIG_S5P_MEM_CMA=y
+CONFIG_S5P_DEV_MIPI_DSI=y
 # CONFIG_S5P_BTS is not set
 # CONFIG_S3C_DEV_TSI is not set
 CONFIG_ARCH_EXYNOS4=y
@@ -369,7 +374,6 @@ CONFIG_EXYNOS4_LOWPWR_IDLE=y
 CONFIG_EXYNOS_MCT=y
 CONFIG_EXYNOS_DEV_PD=y
 CONFIG_EXYNOS4_DEV_FIMC_LITE=y
-CONFIG_EXYNOS4_DEV_FIMC_IS=y
 CONFIG_EXYNOS4_SETUP_I2C1=y
 CONFIG_EXYNOS4_SETUP_I2C3=y
 CONFIG_EXYNOS4_SETUP_I2C4=y
@@ -385,13 +389,13 @@ CONFIG_EXYNOS4_SETUP_FIMC0=y
 CONFIG_EXYNOS4_SETUP_FIMC1=y
 CONFIG_EXYNOS4_SETUP_FIMC2=y
 CONFIG_EXYNOS4_SETUP_FIMC3=y
-CONFIG_EXYNOS4_SETUP_FIMC_IS=y
 CONFIG_EXYNOS4_SETUP_USB_PHY=y
 CONFIG_EXYNOS4_SETUP_CSIS=y
 CONFIG_EXYNOS4_SETUP_FB_S5P=y
 CONFIG_EXYNOS4_SETUP_TVOUT=y
 CONFIG_EXYNOS4_SETUP_THERMAL=y
 # CONFIG_EXYNOS_SETUP_THERMAL is not set
+CONFIG_EXYNOS4_SETUP_MIPI_DSI=y
 CONFIG_EXYNOS4_SETUP_JPEG=y
 CONFIG_EXYNOS4_ENABLE_CLOCK_DOWN=y
 CONFIG_EXYNOS4_CPUFREQ=y
@@ -420,7 +424,6 @@ CONFIG_BUSFREQ_QOS_1280X800=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=y
 # CONFIG_COMPACTION_RETRY is not set
@@ -449,6 +452,11 @@ CONFIG_TARGET_LOCALE_EUR=y
 # CONFIG_TARGET_LOCALE_JPN is not set
 # CONFIG_TARGET_LOCALE_CHN is not set
 # CONFIG_TARGET_LOCALE_USA is not set
+CONFIG_MACH_KONA_EUR_OPEN=y
+# CONFIG_MACH_KONA_EUR_WIFI is not set
+# CONFIG_MACH_KONA_EUR_LTE is not set
+# CONFIG_MACH_KONALTE_USA_ATT is not set
+# CONFIG_MACH_KONA_KOR_WIFI is not set
 # CONFIG_MACH_SMDK4X12 is not set
 CONFIG_MACH_MIDAS=y
 # CONFIG_MACH_M0 is not set
@@ -458,7 +466,6 @@ CONFIG_MACH_MIDAS=y
 # CONFIG_MACH_GC1 is not set
 # CONFIG_MACH_T0 is not set
 CONFIG_MACH_KONA=y
-CONFIG_MACH_KONA_SENSOR=y
 # CONFIG_MACH_IRON is not set
 # CONFIG_MACH_GRANDE is not set
 # CONFIG_MACH_BAFFIN is not set
@@ -471,21 +478,12 @@ CONFIG_MACH_KONA_SENSOR=y
 CONFIG_KONA_01_BD=y
 # CONFIG_IRON_BD is not set
 # CONFIG_GRANDE_BD is not set
-# CONFIG_SLP is not set
-# CONFIG_MACH_REDWOOD is not set
-# CONFIG_GPS_BCM47511 is not set
-CONFIG_GPS_BCM4752=y
-# CONFIG_GPS_GSD4T is not set
-# CONFIG_GPIO_NAPLES_00_BD is not set
-# CONFIG_SLP_DISP_DEBUG is not set
-# CONFIG_EXYNOS4_DEV_TMU is not set
-# CONFIG_BT_TIZEN is not set
 # CONFIG_WRITEBACK_ENABLED is not set
 CONFIG_EXYNOS_SOUND_PLATFORM_DATA=y
-CONFIG_USE_ADC_DET=y
 # CONFIG_JACK_FET is not set
 # CONFIG_JACK_GROUND_DET is not set
-# CONFIG_SAMSUNG_ANALOG_UART_SWITCH is not set
+CONFIG_USE_ADC_DET=y
+CONFIG_SAMSUNG_ANALOG_UART_SWITCH=1
 # CONFIG_EXYNOS5_DEV_BTS is not set
 
 #
@@ -539,6 +537,7 @@ CONFIG_SEC_LOG=y
 CONFIG_SEC_LOG_NONCACHED=y
 CONFIG_SEC_LOG_LAST_KMSG=y
 CONFIG_EHCI_IRQ_DISTRIBUTION=y
+CONFIG_EHCI_MODEM_PORTNUM=2
 
 #
 # Samsung Modem Feature
@@ -577,7 +576,6 @@ CONFIG_BT_MGMT=y
 # Qualcomm Modem Feature
 #
 # CONFIG_QC_MODEM is not set
-# CONFIG_CPU_FREQ_TETHERING is not set
 # CONFIG_MSM_SUBSYSTEM_RESTART is not set
 # CONFIG_QC_MODEM_MDM9X15 is not set
 # CONFIG_MDM_HSIC_PM is not set
@@ -586,6 +584,7 @@ CONFIG_SIM_DETECT=y
 CONFIG_USB_CDFS_SUPPORT=y
 # CONFIG_SAMSUNG_PRODUCT_SHIP is not set
 # CONFIG_CORESIGHT_ETM is not set
+CONFIG_MACH_KONA_SENSOR=y
 
 #
 # Processor Type
@@ -640,6 +639,9 @@ CONFIG_ARM_ERRATA_761320=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
@@ -650,8 +652,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
@@ -700,12 +700,12 @@ CONFIG_VIRT_TO_BUS=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_CLEANCACHE is not set
+# CONFIG_ZSMALLOC is not set
 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
@@ -756,6 +756,7 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
 # CONFIG_CPU_FREQ_GOV_ADAPTIVE is not set
 CONFIG_CPU_FREQ_GOV_PEGASUSQ=y
+# CONFIG_CPU_FREQ_GOV_PEGASUSQ_BOOST is not set
 # CONFIG_CPU_FREQ_GOV_SLP is not set
 CONFIG_CPU_FREQ_DVFS_MONITOR=y
 CONFIG_CPU_IDLE=y
@@ -807,6 +808,7 @@ CONFIG_ARCH_HAS_OPP=y
 CONFIG_PM_OPP=y
 CONFIG_PM_RUNTIME_CLK=y
 # CONFIG_SUSPEND_TIME is not set
+CONFIG_CPU_PM=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_NET=y
 
@@ -849,6 +851,8 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
+# CONFIG_DEFAULT_CUBIC is not set
+# CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
@@ -1195,6 +1199,7 @@ CONFIG_WIRELESS_EXT_SYSFS=y
 # CONFIG_LIB80211 is not set
 # CONFIG_CFG80211_ALLOW_RECONNECT is not set
 # CONFIG_MAC80211 is not set
+# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
 # CONFIG_WIMAX is not set
 CONFIG_RFKILL=y
 CONFIG_RFKILL_PM=y
@@ -1208,6 +1213,14 @@ CONFIG_RFKILL_PM=y
 #
 # Device Drivers
 #
+CONFIG_MALI400=y
+CONFIG_MALI_VER_R3P2=y
+# CONFIG_MALI400_DEBUG is not set
+# CONFIG_MALI400_PROFILING is not set
+CONFIG_MALI_DVFS=y
+CONFIG_MALI400_UMP=y
+# CONFIG_MALI_SHARED_INTERRUPTS is not set
+# CONFIG_UMP_DEBUG is not set
 
 #
 # Generic Driver Options
@@ -1263,7 +1276,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
@@ -1273,19 +1285,24 @@ 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 is not set
 # CONFIG_MUIC_DET_JACK is not set
 # CONFIG_FM34_WE395 is not set
 # CONFIG_AUDIENCE_ES305 is not set
 # CONFIG_2MIC_FM34_WE395 is not set
+# CONFIG_MUIC_MAX77693_SEPARATE_MHL_PORT is not set
+CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK=y
+CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK=y
+# CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK is not set
 # CONFIG_USBHUB_USB3503 is not set
 # CONFIG_USBHUB_USB3503_OTG_CONN is not set
 # CONFIG_USBHUB_USB3803 is not set
 # CONFIG_PN544 is not set
+# CONFIG_STMPE811_ADC is not set
 # CONFIG_MPU_SENSORS_MPU3050 is not set
 # CONFIG_MPU_SENSORS_MPU6050 is not set
+CONFIG_UID_CPUTIME=y
 # CONFIG_C2PORT is not set
 
 #
@@ -1310,10 +1327,13 @@ CONFIG_SEC_MODEM=y
 CONFIG_UMTS_MODEM_XMM6262=y
 # CONFIG_CDMA_MODEM_CBP71 is not set
 # CONFIG_CDMA_MODEM_CBP72 is not set
+# CONFIG_CDMA_MODEM_CBP82 is not set
 # CONFIG_LTE_MODEM_CMC221 is not set
+# CONFIG_UMTS_MODEM_SS222 is not set
 # CONFIG_CDMA_MODEM_MDM6600 is not set
 # CONFIG_TDSCDMA_MODEM_SPRD8803 is not set
 # CONFIG_GSM_MODEM_ESC6270 is not set
+# CONFIG_CDMA_MODEM_QSC6085 is not set
 # CONFIG_LINK_DEVICE_MIPI is not set
 # CONFIG_LINK_DEVICE_DPRAM is not set
 # CONFIG_LINK_DEVICE_PLD is not set
@@ -1321,13 +1341,13 @@ CONFIG_UMTS_MODEM_XMM6262=y
 CONFIG_LINK_DEVICE_HSIC=y
 # CONFIG_LINK_DEVICE_C2C is not set
 # CONFIG_LINK_DEVICE_SPI is not set
+# CONFIG_BOOT_DEVICE_SPI is not set
 # CONFIG_WORKQUEUE_FRONT is not set
 # CONFIG_IPC_CMC22x_OLD_RFS is not set
 # CONFIG_SIPC_VER_5 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
 
@@ -1408,9 +1428,16 @@ CONFIG_WLAN=y
 # CONFIG_USB_NET_RNDIS_WLAN is not set
 CONFIG_WIFI_CONTROL_FUNC=y
 # CONFIG_ATH_COMMON is not set
+# CONFIG_B43LEGACY_DMA_AND_PIO_MODE is not set
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
 # CONFIG_BCM4330 is not set
 CONFIG_BCM4334=m
+# CONFIG_BCM4335 is not set
+# CONFIG_BCM4339 is not set
+# CONFIG_BCM4354 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
@@ -1419,7 +1446,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
@@ -1481,8 +1507,6 @@ CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_SECBRIDGE is not set
 CONFIG_INPUT_KEYRESET=y
 # CONFIG_INPUT_FBSUSPEND is not set
-# CONFIG_INPUT_MPU6050 is not set
-# CONFIG_INPUT_MPU6050_POLLING is not set
 
 #
 # Input Device Drivers
@@ -1506,7 +1530,9 @@ CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_SENSORS_HALL=y
 # CONFIG_KEYBOARD_CYPRESS_TOUCH is not set
+# CONFIG_KEYBOARD_CYPRESS_TOUCH_BLN is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
@@ -1564,7 +1590,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_S7301=y
 CONFIG_TOUCHSCREEN_SYNAPTICS_S7301_KEYS=y
 CONFIG_TOUCHSCREEN_SYNAPTICS_S7301_WORKAROUND=y
 CONFIG_TOUCHSCREEN_SYNAPTICS_S7301_KEYLED=y
-# CONFIG_TOUCHSCREEN_CYPRESS_TMA46X is not set
+# CONFIG_TOUCHSCREEN_CYTTSP4 is not set
 CONFIG_SEC_TOUCHSCREEN_DVFS_LOCK=y
 CONFIG_SEC_TOUCHSCREEN_SURFACE_TOUCH=y
 # CONFIG_KEYPAD_MELFAS_TOUCH is not set
@@ -1572,27 +1598,6 @@ CONFIG_SEC_TOUCHSCREEN_SURFACE_TOUCH=y
 CONFIG_INPUT_WACOM=y
 # CONFIG_EPEN_WACOM_G5SP is not set
 # CONFIG_EPEN_WACOM_G9PM is not set
-CONFIG_EPEN_WACOM_G9PL=y
-# CONFIG_RMI4_DEBUG is not set
-# CONFIG_RMI4_BUS is not set
-# CONFIG_RMI4_GENERIC is not set
-# CONFIG_RMI4_F09 is not set
-# CONFIG_RMI4_F1A is not set
-# CONFIG_RMI4_F11 is not set
-# CONFIG_RMI4_VIRTUAL_BUTTONS is not set
-# CONFIG_RMI4_F17 is not set
-# CONFIG_RMI4_F19 is not set
-# CONFIG_RMI4_F21 is not set
-# CONFIG_RMI4_F30 is not set
-# CONFIG_RMI4_F31 is not set
-# CONFIG_RMI4_F34 is not set
-# CONFIG_RMI4_F41 is not set
-# CONFIG_RMI4_F54 is not set
-# CONFIG_RMI4_SMB is not set
-# CONFIG_RMI4_I2C is not set
-# CONFIG_RMI4_SPI is not set
-# CONFIG_RMI4_DEV is not set
-# CONFIG_RMI4_FWLIB is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_SENSORS_BH1721FVC is not set
 # CONFIG_INPUT_AD714X is not set
@@ -1826,10 +1831,15 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_BATTERY_MAX17042_FUELGAUGE is not set
 # CONFIG_BATTERY_MAX17047_FUELGAUGE is not set
 CONFIG_BATTERY_MAX17047_C_FUELGAUGE=y
-CONFIG_BATTERY_MAX77693_CHARGER=y
 # CONFIG_BATTERY_SMB136_CHARGER is not set
+CONFIG_BATTERY_MAX77693_CHARGER=y
+# CONFIG_BATTERY_WPC_CHARGER is not set
 # CONFIG_BATTERY_SAMSUNG_P1X is not set
+# CONFIG_FUELGAUGE_DUMMY is not set
+# CONFIG_FUELGAUGE_MAX17048 is not set
+# CONFIG_CHARGER_DUMMY is not set
 # CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_SMB328 is not set
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PDA_POWER is not set
 # CONFIG_TEST_POWER is not set
@@ -1852,16 +1862,13 @@ CONFIG_BATTERY_SAMSUNG=y
 # CONFIG_SMB328_CHARGER is not set
 # CONFIG_SMB347_CHARGER is not set
 # CONFIG_CHARGER_MANAGER is not set
-CONFIG_SAMSUNG_LPM_MODE=y
 # CONFIG_HWMON is not set
 CONFIG_THERMAL=y
 # CONFIG_CPU_THERMAL is not set
 # CONFIG_SENSORS_EXYNOS4_TMU is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
-# CONFIG_CHARGER_NCP1851 is not set
-# CONFIG_FUELGAUGE_MAX17050 is not set
-# CONFIG_FUELGAUGE_MAX17050_COULOMB_COUNTING is not set
+
 #
 # Watchdog Device Drivers
 #
@@ -2057,12 +2064,6 @@ CONFIG_VIDEO_IR_I2C=y
 # CONFIG_VIDEO_TVP5150 is not set
 # CONFIG_VIDEO_TVP7002 is not set
 # CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_S5K3H2 is not set
-# CONFIG_VIDEO_S5K3H7 is not set
-# CONFIG_VIDEO_S5K4E5 is not set
-# CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_S5K6A3_CSI_C is not set
-# CONFIG_S5K6A3_CSI_D is not set
 # CONFIG_VIDEO_M5MO is not set
 # CONFIG_VIDEO_M9MO is not set
 # CONFIG_VIDEO_S5K5BAFX is not set
@@ -2070,12 +2071,12 @@ CONFIG_VIDEO_IR_I2C=y
 # CONFIG_VIDEO_SR200PC20 is not set
 # CONFIG_VIDEO_SR200PC20M is not set
 CONFIG_VIDEO_ISX012=y
-CONFIG_VIDEO_SR130PC20=y
 # CONFIG_VIDEO_SLP_S5K4ECGX is not set
 # CONFIG_VIDEO_SLP_DB8131M is not set
 # CONFIG_VIDEO_S5K4EA is not set
 # CONFIG_VIDEO_S5C73M3 is not set
 # CONFIG_VIDEO_SLP_S5C73M3 is not set
+CONFIG_VIDEO_SR130PC20=y
 CONFIG_VIDEO_IMPROVE_STREAMOFF=y
 
 #
@@ -2142,7 +2143,6 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_USB_ZR364XX is not set
 # CONFIG_USB_STKWEBCAM is not set
 # CONFIG_USB_S2255 is not set
-CONFIG_MALI_400MP_UMP=y
 CONFIG_VIDEO_SAMSUNG=y
 CONFIG_VIDEO_SAMSUNG_V4L2=y
 CONFIG_VIDEO_FIMC=y
@@ -2171,6 +2171,8 @@ CONFIG_LSI_HDMI_AUDIO_CH_EVENT=y
 CONFIG_VIDEO_MFC5X=y
 CONFIG_VIDEO_MFC_MAX_INSTANCE=4
 # CONFIG_VIDEO_MFC5X_DEBUG is not set
+# CONFIG_VIDEO_MALI400MP is not set
+# CONFIG_VIDEO_UMP is not set
 CONFIG_VIDEO_FIMG2D=y
 # CONFIG_VIDEO_FIMG2D_DEBUG is not set
 CONFIG_VIDEO_FIMG2D4X=y
@@ -2192,20 +2194,10 @@ CONFIG_VIDEO_SAMSUNG_MEMSIZE_JPEG=0
 CONFIG_VIDEO_SAMSUNG_MEMSIZE_TVOUT=0
 CONFIG_VIDEO_EXYNOS=y
 CONFIG_VIDEO_EXYNOS_MEMSIZE_FIMC_IS=12288
-CONFIG_EXYNOS_MEDIA_DEVICE=y
-# CONFIG_VIDEO_EXYNOS_FIMC_LITE  is not set
-
-#
-# Reserved memory configurations
-#
-CONFIG_VIDEO_SAMSUNG_MEMSIZE_FLITE0=10240
-CONFIG_VIDEO_SAMSUNG_MEMSIZE_FLITE1=10240
-# CONFIG_VIDEO_EXYNOS_MIPI_CSIS is not set
+# CONFIG_VIDEO_EXYNOS_FIMC_LITE is not set
 # CONFIG_VIDEO_EXYNOS_TV is not set
 # CONFIG_VIDEO_EXYNOS_ROTATOR is not set
-# CONFIG_VIDEO_EXYNOS_FIMC_IS  is not set
-# CONFIG_VIDEO_EXYNOS_FIMC_IS_BAYER is not set
-CONFIG_MEDIA_EXYNOS=y
+# CONFIG_VIDEO_EXYNOS_FIMC_IS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
 
@@ -2222,29 +2214,14 @@ CONFIG_SAMSUNG_WORKAROUND_HPD_GLANCE=y
 # CONFIG_ISDBT is not set
 
 #
-# MUIC device
-#
-# CONFIG_STMPE811_ADC is not set
-CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK=y
-CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK=y
-
-#
 # Graphics support
 #
-# CONFIG_MALI_VER_BEFORE_R3P2 is not set
 # CONFIG_DRM is not set
 CONFIG_ION=y
 CONFIG_ION_EXYNOS=y
 CONFIG_ION_EXYNOS_CONTIGHEAP_SIZE=81920
 # CONFIG_ION_EXYNOS_CONTIGHEAP_DEBUG is not set
-# CONFIG_VITHAR is not set
-CONFIG_MALI400=y
-CONFIG_MALI_VER_R3P2=y
-# CONFIG_MALI400_DEBUG is not set
-# CONFIG_MALI400_PROFILING is not set
-CONFIG_MALI_DVFS=y
-CONFIG_MALI400_UMP=y
-# CONFIG_MALI_SHARED_INTERRUPTS is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
@@ -2275,6 +2252,7 @@ CONFIG_FB_S5P_SPLASH_SCREEN=y
 # CONFIG_FB_S5P_LCD_INIT is not set
 # CONFIG_FB_S5P_DEBUG is not set
 CONFIG_FB_S5P_VSYNC_THREAD=y
+# CONFIG_FB_S5P_VSYNC_SEND_UEVENTS is not set
 CONFIG_FB_S5P_VSYNC_SYSFS=y
 # CONFIG_FB_S5P_TRACE_UNDERRUN is not set
 CONFIG_FB_S5P_DEFAULT_WINDOW=3
@@ -2283,12 +2261,18 @@ CONFIG_FB_S5P_NR_BUFFERS=2
 CONFIG_VIDEO_SAMSUNG_MEMSIZE_FIMD=8192
 CONFIG_FB_S5P_MDNIE=y
 CONFIG_FB_MDNIE_PWM=y
-CONFIG_FB_EBOOK_PANEL_SCENARIO=y
 CONFIG_FB_S5P_MIPI_DSIM=y
 CONFIG_FB_BGRA_ORDER=y
 # CONFIG_FB_RGBA_ORDER is not set
 # CONFIG_FB_S5P_S6C1372 is not set
 # CONFIG_FB_S5P_LD9040 is not set
+# CONFIG_FB_S5P_LMS501XX is not set
+# CONFIG_FB_S5P_DUMMY_MIPI_LCD is not set
+# CONFIG_FB_S5P_S6E8AA0 is not set
+# CONFIG_FB_S5P_EA8061 is not set
+# CONFIG_FB_S5P_S6EVR02 is not set
+# CONFIG_FB_S5P_S6D6AA1 is not set
+# CONFIG_FB_S5P_S6E63M0 is not set
 CONFIG_FB_S5P_NT71391=y
 # CONFIG_LCD_FREQ_SWITCH is not set
 CONFIG_FB_S5P_EXTDSP=y
@@ -2297,10 +2281,10 @@ CONFIG_FB_S5P_EXTDSP_NR_BUFFERS=3
 # CONFIG_S5P_DSIM_SWITCHABLE_DUAL_LCD is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_TMIO is not set
-# CONFIG_S5P_MIPI_DSI2 is not set
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX_PCI_GDC is not set
 # CONFIG_FB_BROADSHEET is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
@@ -2370,6 +2354,7 @@ CONFIG_SND_SOC=y
 # CONFIG_SND_SOC_CACHE_LZO is not set
 CONFIG_SND_SOC_SAMSUNG=y
 CONFIG_SND_SAMSUNG_I2S=y
+# CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811 is not set
 CONFIG_SND_SOC_SAMSUNG_KONA_WM1811=y
 # CONFIG_SND_SOC_SAMSUNG_USE_DMA_WRAPPER is not set
 CONFIG_SND_SOC_SAMSUNG_I2S_SEC=y
@@ -2552,7 +2537,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
 
 #
@@ -2654,6 +2638,12 @@ CONFIG_USB_GADGET_SELECTED=y
 CONFIG_USB_GADGET_S3C_OTGD=y
 # CONFIG_USB_GADGET_PXA_U2O is not set
 # CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_CI13XXX_PCI is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LANGWELL is not set
+# CONFIG_USB_GADGET_EG20T is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 
 #
@@ -2750,12 +2740,14 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_LT3593 is not set
 # CONFIG_LEDS_SWITCH is not set
+# CONFIG_LEDS_MAX77693 is not set
 # CONFIG_LEDS_AAT1290A is not set
 # CONFIG_LEDS_TRIGGERS is not set
 
 #
 # LED Triggers
 #
+# CONFIG_LEDS_TRIGGER_NOTIFICATION is not set
 # CONFIG_NFC_DEVICES is not set
 CONFIG_SWITCH=y
 CONFIG_SWITCH_GPIO=y
@@ -2868,14 +2860,14 @@ CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL=0x11d
 CONFIG_ANDROID_TIMED_OUTPUT=y
 # CONFIG_ANDROID_TIMED_GPIO is not set
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
+CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
+CONFIG_ANDROID_LMK_ADJ_RBTREE=y
 # CONFIG_POHMELFS is not set
 # CONFIG_LINE6_USB is not set
 # CONFIG_USB_SERIAL_QUATECH2 is not set
 # CONFIG_USB_SERIAL_QUATECH_USB2 is not set
 # CONFIG_VT6656 is not set
 # CONFIG_IIO is not set
-# CONFIG_XVMALLOC is not set
-# CONFIG_ZRAM is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_LIRC_STAGING is not set
 # CONFIG_EASYCAP is not set
@@ -2901,7 +2893,6 @@ CONFIG_CLKDEV_LOOKUP=y
 CONFIG_VIBETONZ=y
 CONFIG_MOTOR_DRV_MAX77693=y
 # CONFIG_MOTOR_DRV_ISA1200 is not set
-# CONFIG_MOTOR_DRV_DRV2603 is not set
 # CONFIG_FM_RADIO is not set
 CONFIG_SENSORS_CORE=y
 # CONFIG_SENSORS_AK8975C is not set
@@ -2909,10 +2900,7 @@ CONFIG_SENSORS_CORE=y
 # CONFIG_SENSORS_BMP180 is not set
 # CONFIG_SENSORS_CM3663 is not set
 # CONFIG_SENSORS_PAS2M110 is not set
-CONFIG_INPUT_YAS_MAGNETOMETER_POSITION=2
 # CONFIG_SENSORS_BMA254 is not set
-CONFIG_SENSORS_YAS532=y
-CONFIG_SENSORS_YAS_ORI=y
 # CONFIG_SENSORS_TAOS is not set
 # CONFIG_SENSORS_GP2A is not set
 # CONFIG_SENSORS_GP2A_ANALOG is not set
@@ -2925,6 +2913,9 @@ CONFIG_SENSOR_K3DH_INPUTDEV=y
 # CONFIG_SENSORS_K3G is not set
 # CONFIG_SENSORS_LSM330DLC is not set
 # CONFIG_SENSORS_LPS331 is not set
+CONFIG_SENSORS_YAS532=y
+CONFIG_SENSORS_YAS_ORI=y
+CONFIG_INPUT_YAS_MAGNETOMETER_POSITION=2
 # CONFIG_SENSORS_SYSFS is not set
 # CONFIG_SENSORS_SSP is not set
 # CONFIG_SENSORS_SSP_LSM330 is not set
@@ -2946,13 +2937,13 @@ CONFIG_IR_REMOCON=y
 CONFIG_IR_REMOCON_MC96=y
 # CONFIG_EXTCON is not set
 # CONFIG_BARCODE_EMUL is not set
+# CONFIG_SAMSUNG_PHONE_TTY is not set
 CONFIG_MOBICORE_SUPPORT=y
 # CONFIG_MOBICORE_DEBUG is not set
 CONFIG_MOBICORE_API=y
 CONFIG_IOMMU_SUPPORT=y
 # CONFIG_FELICA is not set
 # CONFIG_AUTHENTEC_VPNCLIENT_INTERCEPTOR is not set
-# CONFIG_J4FS is not set
 
 #
 # File systems
@@ -2969,6 +2960,7 @@ CONFIG_EXT4_FS_SECURITY=y
 # CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_XFS_FS is not set
@@ -3031,6 +3023,10 @@ CONFIG_WTL_ENCRYPTION_FILTER=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+# CONFIG_JFFS2_CMODE_PRIORITY is not set
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
 # CONFIG_LOGFS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_SQUASHFS is not set
@@ -3040,9 +3036,13 @@ CONFIG_WTL_ENCRYPTION_FILTER=y
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
+# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
 # CONFIG_PSTORE is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
+# CONFIG_F2FS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
@@ -3140,7 +3140,6 @@ CONFIG_NLS_UTF8=y
 #
 CONFIG_PRINTK_TIME=y
 CONFIG_PRINTK_CPU_ID=y
-CONFIG_UID_CPUTIME=y
 # CONFIG_PRINTK_PID is not set
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 CONFIG_ENABLE_WARN_DEPRECATED=y
@@ -3286,6 +3285,9 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_IMA is not set
 CONFIG_DEFAULT_SECURITY_SELINUX=y
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 # CONFIG_DEFAULT_SECURITY_DAC is not set
 CONFIG_DEFAULT_SECURITY="selinux"
 CONFIG_CRYPTO=y
@@ -3386,6 +3388,8 @@ CONFIG_CRYPTO_TWOFISH_COMMON=y
 CONFIG_CRYPTO_DEFLATE=y
 # CONFIG_CRYPTO_ZLIB is not set
 # CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_LZ4 is not set
+# CONFIG_CRYPTO_LZ4HC is not set
 
 #
 # Random Number Generation
@@ -3415,6 +3419,9 @@ CONFIG_ZLIB_DEFLATE=y
 # CONFIG_XZ_DEC_BCJ is not set
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=y
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=y
 CONFIG_TEXTSEARCH_BM=y
@@ -3424,5 +3431,3 @@ CONFIG_HAS_DMA=y
 CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
 # CONFIG_AVERAGE is not set
-
-CONFIG_SENSORS_HALL=y
diff --git a/arch/arm/configs/cyanogenmod_n5120_defconfig b/arch/arm/configs/cyanogenmod_n5120_defconfig
index bc698f1f67c..d039b3996cc 100644
--- a/arch/arm/configs/cyanogenmod_n5120_defconfig
+++ b/arch/arm/configs/cyanogenmod_n5120_defconfig
@@ -70,6 +70,7 @@ CONFIG_GENERIC_IRQ_CHIP=y
 # RCU Subsystem
 #
 CONFIG_TREE_PREEMPT_RCU=y
+# CONFIG_TINY_RCU is not set
 CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
@@ -107,6 +108,7 @@ CONFIG_RD_GZIP=y
 # CONFIG_RD_LZMA is not set
 # CONFIG_RD_XZ is not set
 # CONFIG_RD_LZO is not set
+# CONFIG_RD_LZ4 is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_CC_CHECK_WARNING_STRICTLY is not set
 CONFIG_SYSCTL=y
@@ -189,6 +191,8 @@ 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"
 # CONFIG_INLINE_SPIN_TRYLOCK is not set
@@ -355,6 +359,7 @@ CONFIG_S5P_DEV_USB_EHCI=y
 CONFIG_S5P_DEV_FIMD_S5P=y
 CONFIG_S5P_DEV_USBGADGET=y
 CONFIG_S5P_MEM_CMA=y
+CONFIG_S5P_DEV_MIPI_DSI=y
 # CONFIG_S5P_BTS is not set
 # CONFIG_S3C_DEV_TSI is not set
 CONFIG_ARCH_EXYNOS4=y
@@ -369,7 +374,6 @@ CONFIG_EXYNOS4_LOWPWR_IDLE=y
 CONFIG_EXYNOS_MCT=y
 CONFIG_EXYNOS_DEV_PD=y
 CONFIG_EXYNOS4_DEV_FIMC_LITE=y
-CONFIG_EXYNOS4_DEV_FIMC_IS=y
 CONFIG_EXYNOS4_SETUP_I2C1=y
 CONFIG_EXYNOS4_SETUP_I2C3=y
 CONFIG_EXYNOS4_SETUP_I2C4=y
@@ -385,13 +389,13 @@ CONFIG_EXYNOS4_SETUP_FIMC0=y
 CONFIG_EXYNOS4_SETUP_FIMC1=y
 CONFIG_EXYNOS4_SETUP_FIMC2=y
 CONFIG_EXYNOS4_SETUP_FIMC3=y
-CONFIG_EXYNOS4_SETUP_FIMC_IS=y
 CONFIG_EXYNOS4_SETUP_USB_PHY=y
 CONFIG_EXYNOS4_SETUP_CSIS=y
 CONFIG_EXYNOS4_SETUP_FB_S5P=y
 CONFIG_EXYNOS4_SETUP_TVOUT=y
 CONFIG_EXYNOS4_SETUP_THERMAL=y
 # CONFIG_EXYNOS_SETUP_THERMAL is not set
+CONFIG_EXYNOS4_SETUP_MIPI_DSI=y
 CONFIG_EXYNOS4_SETUP_JPEG=y
 CONFIG_EXYNOS4_ENABLE_CLOCK_DOWN=y
 CONFIG_EXYNOS4_CPUFREQ=y
@@ -420,7 +424,6 @@ CONFIG_BUSFREQ_QOS_1280X800=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=y
 # CONFIG_COMPACTION_RETRY is not set
@@ -449,6 +452,11 @@ CONFIG_TARGET_LOCALE_EUR=y
 # CONFIG_TARGET_LOCALE_JPN is not set
 # CONFIG_TARGET_LOCALE_CHN is not set
 # CONFIG_TARGET_LOCALE_USA is not set
+# CONFIG_MACH_KONA_EUR_OPEN is not set
+# CONFIG_MACH_KONA_EUR_WIFI is not set
+CONFIG_MACH_KONA_EUR_LTE=y
+# CONFIG_MACH_KONALTE_USA_ATT is not set
+# CONFIG_MACH_KONA_KOR_WIFI is not set
 # CONFIG_MACH_SMDK4X12 is not set
 CONFIG_MACH_MIDAS=y
 # CONFIG_MACH_M0 is not set
@@ -458,7 +466,6 @@ CONFIG_MACH_MIDAS=y
 # CONFIG_MACH_GC1 is not set
 # CONFIG_MACH_T0 is not set
 CONFIG_MACH_KONA=y
-CONFIG_MACH_KONA_SENSOR=y
 # CONFIG_MACH_IRON is not set
 # CONFIG_MACH_GRANDE is not set
 # CONFIG_MACH_BAFFIN is not set
@@ -469,24 +476,14 @@ CONFIG_MACH_KONA_SENSOR=y
 # CONFIG_T0_04_BD is not set
 # CONFIG_KONA_00_BD is not set
 CONFIG_KONA_01_BD=y
-CONFIG_MACH_KONA_EUR_LTE=y
 # CONFIG_IRON_BD is not set
 # CONFIG_GRANDE_BD is not set
-# CONFIG_SLP is not set
-# CONFIG_MACH_REDWOOD is not set
-# CONFIG_GPS_BCM47511 is not set
-# CONFIG_GPS_BCM4752 is not set
-# CONFIG_GPS_GSD4T is not set
-# CONFIG_GPIO_NAPLES_00_BD is not set
-# CONFIG_SLP_DISP_DEBUG is not set
-# CONFIG_EXYNOS4_DEV_TMU is not set
-# CONFIG_BT_TIZEN is not set
 # CONFIG_WRITEBACK_ENABLED is not set
 CONFIG_EXYNOS_SOUND_PLATFORM_DATA=y
-CONFIG_USE_ADC_DET=y
 # CONFIG_JACK_FET is not set
 # CONFIG_JACK_GROUND_DET is not set
-# CONFIG_SAMSUNG_ANALOG_UART_SWITCH is not set
+CONFIG_USE_ADC_DET=y
+CONFIG_SAMSUNG_ANALOG_UART_SWITCH=1
 # CONFIG_EXYNOS5_DEV_BTS is not set
 
 #
@@ -523,7 +520,6 @@ CONFIG_EXYNOS4_MSHC_DDR=y
 #
 CONFIG_SEC_DEBUG=y
 CONFIG_SEC_DEBUG_SCHED_LOG=y
-CONFIG_SEC_DEBUG_HRTIMER_LOG=y
 # CONFIG_SEC_DEBUG_SOFTIRQ_LOG is not set
 CONFIG_SEC_DEBUG_SCHED_LOG_NONCACHED=y
 # CONFIG_SEC_DEBUG_SEMAPHORE_LOG is not set
@@ -542,29 +538,6 @@ CONFIG_SEC_LOG_LAST_KMSG=y
 CONFIG_EHCI_IRQ_DISTRIBUTION=y
 
 #
-# Samsung Modem Feature
-#
-# CONFIG_LTE_VIA_SWITCH is not set
-# CONFIG_SEC_DUAL_MODEM_MODE is not set
-# CONFIG_SEC_MODEM_M0_C2C is not set
-# CONFIG_SEC_MODEM_M0 is not set
-# CONFIG_SEC_MODEM_M0_CTC is not set
-# CONFIG_SEC_MODEM_T0_CU_DUOS is not set
-# CONFIG_SEC_MODEM_T0_OPEN_DUOS is not set
-# CONFIG_SEC_MODEM_M0_GRANDECTC is not set
-# CONFIG_SEC_MODEM_M1 is not set
-# CONFIG_SEC_MODEM_C1 is not set
-# CONFIG_SEC_MODEM_C1_LGT is not set
-# CONFIG_SEC_MODEM_M2 is not set
-# CONFIG_SEC_MODEM_U1 is not set
-# CONFIG_SEC_MODEM_U1_LGT is not set
-# CONFIG_SEC_MODEM_GAIA is not set
-# CONFIG_SEC_MODEM_IRON is not set
-# 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
@@ -578,17 +551,16 @@ CONFIG_BT_MGMT=y
 # Qualcomm Modem Feature
 #
 CONFIG_QC_MODEM=y
-CONFIG_SIM_DETECT=y
-CONFIG_MSM_RMNET_USB=y
-CONFIG_SENSORS_HALL=y
 CONFIG_MSM_SUBSYSTEM_RESTART=y
 CONFIG_QC_MODEM_MDM9X15=y
 CONFIG_MDM_HSIC_PM=y
 # CONFIG_EMI_ERROR_RECOVERY is not set
+CONFIG_SIM_DETECT=y
 CONFIG_QC_MODEM_M3=y
 CONFIG_USB_CDFS_SUPPORT=y
 CONFIG_SAMSUNG_PRODUCT_SHIP=y
 # CONFIG_CORESIGHT_ETM is not set
+CONFIG_MACH_KONA_SENSOR=y
 
 #
 # Processor Type
@@ -643,6 +615,9 @@ CONFIG_ARM_ERRATA_761320=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
@@ -653,8 +628,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
@@ -703,12 +676,12 @@ CONFIG_VIRT_TO_BUS=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_CLEANCACHE is not set
+# CONFIG_ZSMALLOC is not set
 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
@@ -759,6 +732,7 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
 # CONFIG_CPU_FREQ_GOV_ADAPTIVE is not set
 CONFIG_CPU_FREQ_GOV_PEGASUSQ=y
+# CONFIG_CPU_FREQ_GOV_PEGASUSQ_BOOST is not set
 # CONFIG_CPU_FREQ_GOV_SLP is not set
 CONFIG_CPU_FREQ_DVFS_MONITOR=y
 CONFIG_CPU_IDLE=y
@@ -810,6 +784,7 @@ CONFIG_ARCH_HAS_OPP=y
 CONFIG_PM_OPP=y
 CONFIG_PM_RUNTIME_CLK=y
 # CONFIG_SUSPEND_TIME is not set
+CONFIG_CPU_PM=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_NET=y
 
@@ -852,6 +827,8 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
+# CONFIG_DEFAULT_CUBIC is not set
+# CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
@@ -876,6 +853,7 @@ CONFIG_IPV6_TUNNEL=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 # CONFIG_IPV6_SUBTREES is not set
 # CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETLABEL is not set
 CONFIG_ANDROID_PARANOID_NETWORK=y
 CONFIG_NET_ACTIVITY_STATS=y
 CONFIG_NETWORK_SECMARK=y
@@ -892,6 +870,7 @@ CONFIG_NETFILTER_NETLINK_QUEUE=y
 CONFIG_NETFILTER_NETLINK_LOG=y
 CONFIG_NF_CONNTRACK=y
 CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NF_CONNTRACK_SECMARK is not set
 CONFIG_NF_CONNTRACK_EVENTS=y
 # CONFIG_NF_CONNTRACK_TIMESTAMP is not set
 CONFIG_NF_CT_PROTO_DCCP=y
@@ -922,6 +901,7 @@ CONFIG_NETFILTER_XT_CONNMARK=y
 #
 # Xtables targets
 #
+# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
 # CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
@@ -937,6 +917,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
 # CONFIG_NETFILTER_XT_TARGET_TEE is not set
 CONFIG_NETFILTER_XT_TARGET_TPROXY=y
 CONFIG_NETFILTER_XT_TARGET_TRACE=y
+# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
 # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
 
@@ -1023,6 +1004,7 @@ CONFIG_IP_NF_MANGLE=y
 # CONFIG_IP_NF_TARGET_ECN is not set
 # CONFIG_IP_NF_TARGET_TTL is not set
 CONFIG_IP_NF_RAW=y
+# CONFIG_IP_NF_SECURITY is not set
 CONFIG_IP_NF_ARPTABLES=y
 CONFIG_IP_NF_ARPFILTER=y
 CONFIG_IP_NF_ARP_MANGLE=y
@@ -1049,6 +1031,7 @@ CONFIG_IP6_NF_TARGET_REJECT=y
 CONFIG_IP6_NF_TARGET_REJECT_SKERR=y
 CONFIG_IP6_NF_MANGLE=y
 CONFIG_IP6_NF_RAW=y
+# CONFIG_IP6_NF_SECURITY is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
@@ -1192,6 +1175,7 @@ CONFIG_WIRELESS_EXT_SYSFS=y
 # CONFIG_LIB80211 is not set
 # CONFIG_CFG80211_ALLOW_RECONNECT is not set
 # CONFIG_MAC80211 is not set
+# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
 # CONFIG_WIMAX is not set
 CONFIG_RFKILL=y
 CONFIG_RFKILL_PM=y
@@ -1205,6 +1189,14 @@ CONFIG_RFKILL_PM=y
 #
 # Device Drivers
 #
+CONFIG_MALI400=y
+CONFIG_MALI_VER_R3P2=y
+# CONFIG_MALI400_DEBUG is not set
+# CONFIG_MALI400_PROFILING is not set
+CONFIG_MALI_DVFS=y
+CONFIG_MALI400_UMP=y
+# CONFIG_MALI_SHARED_INTERRUPTS is not set
+# CONFIG_UMP_DEBUG is not set
 
 #
 # Generic Driver Options
@@ -1260,7 +1252,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
@@ -1270,19 +1261,24 @@ 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 is not set
 # CONFIG_MUIC_DET_JACK is not set
 # CONFIG_FM34_WE395 is not set
 # CONFIG_AUDIENCE_ES305 is not set
 # CONFIG_2MIC_FM34_WE395 is not set
+# CONFIG_MUIC_MAX77693_SEPARATE_MHL_PORT is not set
+CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK=y
+CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK=y
+# CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK is not set
 # CONFIG_USBHUB_USB3503 is not set
 # CONFIG_USBHUB_USB3503_OTG_CONN is not set
 # CONFIG_USBHUB_USB3803 is not set
 # CONFIG_PN544 is not set
+# CONFIG_STMPE811_ADC is not set
 # CONFIG_MPU_SENSORS_MPU3050 is not set
 # CONFIG_MPU_SENSORS_MPU6050 is not set
+CONFIG_UID_CPUTIME=y
 # CONFIG_C2PORT is not set
 
 #
@@ -1303,28 +1299,6 @@ CONFIG_UID_STAT=y
 # CONFIG_SENSORS_LIS3_I2C is not set
 # CONFIG_SAMSUNG_C2C is not set
 # CONFIG_SEC_MODEM is not set
-# CONFIG_UMTS_MODEM_XMM6260 is not set
-# CONFIG_UMTS_MODEM_XMM6262 is not set
-# CONFIG_CDMA_MODEM_CBP71 is not set
-# CONFIG_CDMA_MODEM_CBP72 is not set
-# CONFIG_LTE_MODEM_CMC221 is not set
-# CONFIG_CDMA_MODEM_MDM6600 is not set
-# CONFIG_TDSCDMA_MODEM_SPRD8803 is not set
-# CONFIG_GSM_MODEM_ESC6270 is not set
-# CONFIG_LINK_DEVICE_MIPI is not set
-# CONFIG_LINK_DEVICE_DPRAM is not set
-# CONFIG_LINK_DEVICE_PLD is not set
-# CONFIG_LINK_DEVICE_USB is not set
-# CONFIG_LINK_DEVICE_HSIC is not set
-# CONFIG_LINK_DEVICE_C2C is not set
-# CONFIG_LINK_DEVICE_SPI is not set
-# CONFIG_WORKQUEUE_FRONT is not set
-# CONFIG_IPC_CMC22x_OLD_RFS is not set
-# CONFIG_SIPC_VER_5 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
 
@@ -1405,9 +1379,16 @@ CONFIG_WLAN=y
 # CONFIG_USB_NET_RNDIS_WLAN is not set
 CONFIG_WIFI_CONTROL_FUNC=y
 # CONFIG_ATH_COMMON is not set
+# CONFIG_B43LEGACY_DMA_AND_PIO_MODE is not set
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
 # CONFIG_BCM4330 is not set
 CONFIG_BCM4334=m
+# CONFIG_BCM4335 is not set
+# CONFIG_BCM4339 is not set
+# CONFIG_BCM4354 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
@@ -1416,7 +1397,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
@@ -1430,9 +1410,35 @@ CONFIG_WLAN_REGION_CODE=100
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
 CONFIG_USB_USBNET=y
+CONFIG_USB_NET_AX8817X=y
+CONFIG_USB_NET_CDCETHER=y
+# CONFIG_USB_NET_CDC_EEM is not set
+CONFIG_USB_NET_CDC_NCM=y
+# CONFIG_USB_NET_DM9601 is not set
+# CONFIG_USB_NET_SMSC75XX is not set
+# CONFIG_USB_NET_SMSC95XX is not set
+# CONFIG_USB_NET_GL620A is not set
+CONFIG_USB_NET_NET1080=y
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+CONFIG_USB_NET_CDC_SUBSET=y
+# CONFIG_USB_ALI_M5632 is not set
+# CONFIG_USB_AN2720 is not set
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+CONFIG_USB_NET_ZAURUS=y
+# CONFIG_USB_NET_CX82310_ETH is not set
+# CONFIG_USB_NET_KALMIA is not set
 # CONFIG_USB_HSO is not set
+# CONFIG_USB_NET_INT51X1 is not set
 # CONFIG_USB_CDC_PHONET is not set
 # CONFIG_USB_IPHETH is not set
+# CONFIG_USB_SIERRA_NET is not set
+# CONFIG_USB_VL600 is not set
+CONFIG_MSM_RMNET_USB=y
 # CONFIG_WAN is not set
 
 #
@@ -1478,8 +1484,6 @@ CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_SECBRIDGE is not set
 CONFIG_INPUT_KEYRESET=y
 # CONFIG_INPUT_FBSUSPEND is not set
-# CONFIG_INPUT_MPU6050 is not set
-# CONFIG_INPUT_MPU6050_POLLING is not set
 
 #
 # Input Device Drivers
@@ -1503,7 +1507,9 @@ CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_SENSORS_HALL=y
 # CONFIG_KEYBOARD_CYPRESS_TOUCH is not set
+# CONFIG_KEYBOARD_CYPRESS_TOUCH_BLN is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
@@ -1561,7 +1567,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_S7301=y
 CONFIG_TOUCHSCREEN_SYNAPTICS_S7301_KEYS=y
 CONFIG_TOUCHSCREEN_SYNAPTICS_S7301_WORKAROUND=y
 CONFIG_TOUCHSCREEN_SYNAPTICS_S7301_KEYLED=y
-# CONFIG_TOUCHSCREEN_CYPRESS_TMA46X is not set
+# CONFIG_TOUCHSCREEN_CYTTSP4 is not set
 CONFIG_SEC_TOUCHSCREEN_DVFS_LOCK=y
 CONFIG_SEC_TOUCHSCREEN_SURFACE_TOUCH=y
 # CONFIG_KEYPAD_MELFAS_TOUCH is not set
@@ -1569,27 +1575,6 @@ CONFIG_SEC_TOUCHSCREEN_SURFACE_TOUCH=y
 CONFIG_INPUT_WACOM=y
 # CONFIG_EPEN_WACOM_G5SP is not set
 # CONFIG_EPEN_WACOM_G9PM is not set
-CONFIG_EPEN_WACOM_G9PL=y
-# CONFIG_RMI4_DEBUG is not set
-# CONFIG_RMI4_BUS is not set
-# CONFIG_RMI4_GENERIC is not set
-# CONFIG_RMI4_F09 is not set
-# CONFIG_RMI4_F1A is not set
-# CONFIG_RMI4_F11 is not set
-# CONFIG_RMI4_VIRTUAL_BUTTONS is not set
-# CONFIG_RMI4_F17 is not set
-# CONFIG_RMI4_F19 is not set
-# CONFIG_RMI4_F21 is not set
-# CONFIG_RMI4_F30 is not set
-# CONFIG_RMI4_F31 is not set
-# CONFIG_RMI4_F34 is not set
-# CONFIG_RMI4_F41 is not set
-# CONFIG_RMI4_F54 is not set
-# CONFIG_RMI4_SMB is not set
-# CONFIG_RMI4_I2C is not set
-# CONFIG_RMI4_SPI is not set
-# CONFIG_RMI4_DEV is not set
-# CONFIG_RMI4_FWLIB is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_SENSORS_BH1721FVC is not set
 # CONFIG_INPUT_AD714X is not set
@@ -1672,7 +1657,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 #
 # Diag Support
 #
-# CONFIG_DIAG_CHAR is not set
+CONFIG_DIAG_CHAR=y
 
 #
 # DIAG traffic over USB
@@ -1825,10 +1810,15 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_BATTERY_MAX17042_FUELGAUGE is not set
 # CONFIG_BATTERY_MAX17047_FUELGAUGE is not set
 CONFIG_BATTERY_MAX17047_C_FUELGAUGE=y
-CONFIG_BATTERY_MAX77693_CHARGER=y
 # CONFIG_BATTERY_SMB136_CHARGER is not set
+CONFIG_BATTERY_MAX77693_CHARGER=y
+# CONFIG_BATTERY_WPC_CHARGER is not set
 # CONFIG_BATTERY_SAMSUNG_P1X is not set
+# CONFIG_FUELGAUGE_DUMMY is not set
+# CONFIG_FUELGAUGE_MAX17048 is not set
+# CONFIG_CHARGER_DUMMY is not set
 # CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_SMB328 is not set
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PDA_POWER is not set
 # CONFIG_TEST_POWER is not set
@@ -1851,16 +1841,13 @@ CONFIG_BATTERY_SAMSUNG=y
 # CONFIG_SMB328_CHARGER is not set
 # CONFIG_SMB347_CHARGER is not set
 # CONFIG_CHARGER_MANAGER is not set
-CONFIG_SAMSUNG_LPM_MODE=y
 # CONFIG_HWMON is not set
 CONFIG_THERMAL=y
 # CONFIG_CPU_THERMAL is not set
 # CONFIG_SENSORS_EXYNOS4_TMU is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
-# CONFIG_CHARGER_NCP1851 is not set
-# CONFIG_FUELGAUGE_MAX17050 is not set
-# CONFIG_FUELGAUGE_MAX17050_COULOMB_COUNTING is not set
+
 #
 # Watchdog Device Drivers
 #
@@ -2056,12 +2043,6 @@ CONFIG_VIDEO_IR_I2C=y
 # CONFIG_VIDEO_TVP5150 is not set
 # CONFIG_VIDEO_TVP7002 is not set
 # CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_S5K3H2 is not set
-# CONFIG_VIDEO_S5K3H7 is not set
-# CONFIG_VIDEO_S5K4E5 is not set
-# CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_S5K6A3_CSI_C is not set
-# CONFIG_S5K6A3_CSI_D is not set
 # CONFIG_VIDEO_M5MO is not set
 # CONFIG_VIDEO_M9MO is not set
 # CONFIG_VIDEO_S5K5BAFX is not set
@@ -2069,12 +2050,12 @@ CONFIG_VIDEO_IR_I2C=y
 # CONFIG_VIDEO_SR200PC20 is not set
 # CONFIG_VIDEO_SR200PC20M is not set
 CONFIG_VIDEO_ISX012=y
-CONFIG_VIDEO_SR130PC20=y
 # CONFIG_VIDEO_SLP_S5K4ECGX is not set
 # CONFIG_VIDEO_SLP_DB8131M is not set
 # CONFIG_VIDEO_S5K4EA is not set
 # CONFIG_VIDEO_S5C73M3 is not set
 # CONFIG_VIDEO_SLP_S5C73M3 is not set
+CONFIG_VIDEO_SR130PC20=y
 CONFIG_VIDEO_IMPROVE_STREAMOFF=y
 
 #
@@ -2141,7 +2122,6 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_USB_ZR364XX is not set
 # CONFIG_USB_STKWEBCAM is not set
 # CONFIG_USB_S2255 is not set
-CONFIG_MALI_400MP_UMP=y
 CONFIG_VIDEO_SAMSUNG=y
 CONFIG_VIDEO_SAMSUNG_V4L2=y
 CONFIG_VIDEO_FIMC=y
@@ -2170,6 +2150,8 @@ CONFIG_LSI_HDMI_AUDIO_CH_EVENT=y
 CONFIG_VIDEO_MFC5X=y
 CONFIG_VIDEO_MFC_MAX_INSTANCE=4
 # CONFIG_VIDEO_MFC5X_DEBUG is not set
+# CONFIG_VIDEO_MALI400MP is not set
+# CONFIG_VIDEO_UMP is not set
 CONFIG_VIDEO_FIMG2D=y
 # CONFIG_VIDEO_FIMG2D_DEBUG is not set
 CONFIG_VIDEO_FIMG2D4X=y
@@ -2191,20 +2173,10 @@ CONFIG_VIDEO_SAMSUNG_MEMSIZE_JPEG=0
 CONFIG_VIDEO_SAMSUNG_MEMSIZE_TVOUT=0
 CONFIG_VIDEO_EXYNOS=y
 CONFIG_VIDEO_EXYNOS_MEMSIZE_FIMC_IS=12288
-CONFIG_EXYNOS_MEDIA_DEVICE=y
-# CONFIG_VIDEO_EXYNOS_FIMC_LITE  is not set
-
-#
-# Reserved memory configurations
-#
-CONFIG_VIDEO_SAMSUNG_MEMSIZE_FLITE0=10240
-CONFIG_VIDEO_SAMSUNG_MEMSIZE_FLITE1=10240
-# CONFIG_VIDEO_EXYNOS_MIPI_CSIS is not set
+# CONFIG_VIDEO_EXYNOS_FIMC_LITE is not set
 # CONFIG_VIDEO_EXYNOS_TV is not set
 # CONFIG_VIDEO_EXYNOS_ROTATOR is not set
-# CONFIG_VIDEO_EXYNOS_FIMC_IS  is not set
-# CONFIG_VIDEO_EXYNOS_FIMC_IS_BAYER is not set
-CONFIG_MEDIA_EXYNOS=y
+# CONFIG_VIDEO_EXYNOS_FIMC_IS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
 
@@ -2221,29 +2193,14 @@ CONFIG_SAMSUNG_WORKAROUND_HPD_GLANCE=y
 # CONFIG_ISDBT is not set
 
 #
-# MUIC device
-#
-# CONFIG_STMPE811_ADC is not set
-CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK=y
-CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK=y
-
-#
 # Graphics support
 #
-# CONFIG_MALI_VER_BEFORE_R3P2 is not set
 # CONFIG_DRM is not set
 CONFIG_ION=y
 CONFIG_ION_EXYNOS=y
 CONFIG_ION_EXYNOS_CONTIGHEAP_SIZE=81920
 # CONFIG_ION_EXYNOS_CONTIGHEAP_DEBUG is not set
-# CONFIG_VITHAR is not set
-CONFIG_MALI400=y
-CONFIG_MALI_VER_R3P2=y
-# CONFIG_MALI400_DEBUG is not set
-# CONFIG_MALI400_PROFILING is not set
-CONFIG_MALI_DVFS=y
-CONFIG_MALI400_UMP=y
-# CONFIG_MALI_SHARED_INTERRUPTS is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
@@ -2274,6 +2231,7 @@ CONFIG_FB_S5P_SPLASH_SCREEN=y
 # CONFIG_FB_S5P_LCD_INIT is not set
 # CONFIG_FB_S5P_DEBUG is not set
 CONFIG_FB_S5P_VSYNC_THREAD=y
+# CONFIG_FB_S5P_VSYNC_SEND_UEVENTS is not set
 CONFIG_FB_S5P_VSYNC_SYSFS=y
 # CONFIG_FB_S5P_TRACE_UNDERRUN is not set
 CONFIG_FB_S5P_DEFAULT_WINDOW=3
@@ -2282,12 +2240,18 @@ CONFIG_FB_S5P_NR_BUFFERS=2
 CONFIG_VIDEO_SAMSUNG_MEMSIZE_FIMD=8192
 CONFIG_FB_S5P_MDNIE=y
 CONFIG_FB_MDNIE_PWM=y
-CONFIG_FB_EBOOK_PANEL_SCENARIO=y
 CONFIG_FB_S5P_MIPI_DSIM=y
 CONFIG_FB_BGRA_ORDER=y
 # CONFIG_FB_RGBA_ORDER is not set
 # CONFIG_FB_S5P_S6C1372 is not set
 # CONFIG_FB_S5P_LD9040 is not set
+# CONFIG_FB_S5P_LMS501XX is not set
+# CONFIG_FB_S5P_DUMMY_MIPI_LCD is not set
+# CONFIG_FB_S5P_S6E8AA0 is not set
+# CONFIG_FB_S5P_EA8061 is not set
+# CONFIG_FB_S5P_S6EVR02 is not set
+# CONFIG_FB_S5P_S6D6AA1 is not set
+# CONFIG_FB_S5P_S6E63M0 is not set
 CONFIG_FB_S5P_NT71391=y
 # CONFIG_LCD_FREQ_SWITCH is not set
 CONFIG_FB_S5P_EXTDSP=y
@@ -2296,10 +2260,10 @@ CONFIG_FB_S5P_EXTDSP_NR_BUFFERS=3
 # CONFIG_S5P_DSIM_SWITCHABLE_DUAL_LCD is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_TMIO is not set
-# CONFIG_S5P_MIPI_DSI2 is not set
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX_PCI_GDC is not set
 # CONFIG_FB_BROADSHEET is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
@@ -2369,6 +2333,7 @@ CONFIG_SND_SOC=y
 # CONFIG_SND_SOC_CACHE_LZO is not set
 CONFIG_SND_SOC_SAMSUNG=y
 CONFIG_SND_SAMSUNG_I2S=y
+# CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811 is not set
 CONFIG_SND_SOC_SAMSUNG_KONA_WM1811=y
 # CONFIG_SND_SOC_SAMSUNG_USE_DMA_WRAPPER is not set
 CONFIG_SND_SOC_SAMSUNG_I2S_SEC=y
@@ -2406,7 +2371,6 @@ CONFIG_USB_HID=y
 #
 # Special HID drivers
 #
-CONFIG_UHID=y
 CONFIG_HID_A4TECH=y
 CONFIG_HID_ACRUX=y
 # CONFIG_HID_ACRUX_FF is not set
@@ -2552,7 +2516,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
 
 #
@@ -2609,6 +2572,7 @@ CONFIG_USB_SERIAL_QUALCOMM=y
 # CONFIG_USB_SERIAL_TI is not set
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set
+CONFIG_USB_SERIAL_WWAN=y
 # CONFIG_USB_SERIAL_OPTION is not set
 # CONFIG_USB_SERIAL_OMNINET is not set
 # CONFIG_USB_SERIAL_OPTICON is not set
@@ -2642,6 +2606,7 @@ CONFIG_USB_SERIAL_CSVT=y
 # CONFIG_USB_ISIGHTFW is not set
 # CONFIG_USB_YUREX is not set
 CONFIG_USB_QCOM_DIAG_BRIDGE=y
+# CONFIG_USB_QCOM_DIAG_BRIDGE_TEST is not set
 CONFIG_USB_QCOM_MDM_BRIDGE=y
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
@@ -2654,6 +2619,12 @@ CONFIG_USB_GADGET_SELECTED=y
 CONFIG_USB_GADGET_S3C_OTGD=y
 # CONFIG_USB_GADGET_PXA_U2O is not set
 # CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_CI13XXX_PCI is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LANGWELL is not set
+# CONFIG_USB_GADGET_EG20T is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 
 #
@@ -2750,12 +2721,14 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_LT3593 is not set
 # CONFIG_LEDS_SWITCH is not set
+# CONFIG_LEDS_MAX77693 is not set
 # CONFIG_LEDS_AAT1290A is not set
 # CONFIG_LEDS_TRIGGERS is not set
 
 #
 # LED Triggers
 #
+# CONFIG_LEDS_TRIGGER_NOTIFICATION is not set
 # CONFIG_NFC_DEVICES is not set
 CONFIG_SWITCH=y
 CONFIG_SWITCH_GPIO=y
@@ -2868,14 +2841,14 @@ CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL=0x11d
 CONFIG_ANDROID_TIMED_OUTPUT=y
 # CONFIG_ANDROID_TIMED_GPIO is not set
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
+CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
+CONFIG_ANDROID_LMK_ADJ_RBTREE=y
 # CONFIG_POHMELFS is not set
 # CONFIG_LINE6_USB is not set
 # CONFIG_USB_SERIAL_QUATECH2 is not set
 # CONFIG_USB_SERIAL_QUATECH_USB2 is not set
 # CONFIG_VT6656 is not set
 # CONFIG_IIO is not set
-# CONFIG_XVMALLOC is not set
-# CONFIG_ZRAM is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_LIRC_STAGING is not set
 # CONFIG_EASYCAP is not set
@@ -2901,7 +2874,6 @@ CONFIG_CLKDEV_LOOKUP=y
 CONFIG_VIBETONZ=y
 CONFIG_MOTOR_DRV_MAX77693=y
 # CONFIG_MOTOR_DRV_ISA1200 is not set
-# CONFIG_MOTOR_DRV_DRV2603 is not set
 # CONFIG_FM_RADIO is not set
 CONFIG_SENSORS_CORE=y
 # CONFIG_SENSORS_AK8975C is not set
@@ -2909,10 +2881,7 @@ CONFIG_SENSORS_CORE=y
 # CONFIG_SENSORS_BMP180 is not set
 # CONFIG_SENSORS_CM3663 is not set
 # CONFIG_SENSORS_PAS2M110 is not set
-CONFIG_INPUT_YAS_MAGNETOMETER_POSITION=2
 # CONFIG_SENSORS_BMA254 is not set
-CONFIG_SENSORS_YAS532=y
-CONFIG_SENSORS_YAS_ORI=y
 # CONFIG_SENSORS_TAOS is not set
 CONFIG_SENSORS_GP2A=y
 # CONFIG_SENSORS_GP2A_ANALOG is not set
@@ -2925,6 +2894,9 @@ CONFIG_SENSOR_K3DH_INPUTDEV=y
 # CONFIG_SENSORS_K3G is not set
 # CONFIG_SENSORS_LSM330DLC is not set
 # CONFIG_SENSORS_LPS331 is not set
+CONFIG_SENSORS_YAS532=y
+CONFIG_SENSORS_YAS_ORI=y
+CONFIG_INPUT_YAS_MAGNETOMETER_POSITION=2
 # CONFIG_SENSORS_SYSFS is not set
 # CONFIG_SENSORS_SSP is not set
 # CONFIG_SENSORS_SSP_LSM330 is not set
@@ -2946,13 +2918,13 @@ CONFIG_IR_REMOCON=y
 CONFIG_IR_REMOCON_MC96=y
 # CONFIG_EXTCON is not set
 # CONFIG_BARCODE_EMUL is not set
+# CONFIG_SAMSUNG_PHONE_TTY is not set
 CONFIG_MOBICORE_SUPPORT=y
 # CONFIG_MOBICORE_DEBUG is not set
 CONFIG_MOBICORE_API=y
 CONFIG_IOMMU_SUPPORT=y
 # CONFIG_FELICA is not set
 # CONFIG_AUTHENTEC_VPNCLIENT_INTERCEPTOR is not set
-# CONFIG_J4FS is not set
 
 #
 # File systems
@@ -2969,6 +2941,7 @@ CONFIG_EXT4_FS_SECURITY=y
 # CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_XFS_FS is not set
@@ -3031,6 +3004,10 @@ CONFIG_WTL_ENCRYPTION_FILTER=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+# CONFIG_JFFS2_CMODE_PRIORITY is not set
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
 # CONFIG_LOGFS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_SQUASHFS is not set
@@ -3040,9 +3017,13 @@ CONFIG_WTL_ENCRYPTION_FILTER=y
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
+# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
 # CONFIG_PSTORE is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
+# CONFIG_F2FS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
@@ -3140,7 +3121,6 @@ CONFIG_NLS_UTF8=y
 #
 CONFIG_PRINTK_TIME=y
 CONFIG_PRINTK_CPU_ID=y
-CONFIG_UID_CPUTIME=y
 # CONFIG_PRINTK_PID is not set
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 CONFIG_ENABLE_WARN_DEPRECATED=y
@@ -3286,6 +3266,9 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_IMA is not set
 CONFIG_DEFAULT_SECURITY_SELINUX=y
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 # CONFIG_DEFAULT_SECURITY_DAC is not set
 CONFIG_DEFAULT_SECURITY="selinux"
 CONFIG_CRYPTO=y
@@ -3386,6 +3369,8 @@ CONFIG_CRYPTO_TWOFISH_COMMON=y
 CONFIG_CRYPTO_DEFLATE=y
 # CONFIG_CRYPTO_ZLIB is not set
 # CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_LZ4 is not set
+# CONFIG_CRYPTO_LZ4HC is not set
 
 #
 # Random Number Generation
@@ -3415,6 +3400,9 @@ CONFIG_ZLIB_DEFLATE=y
 # CONFIG_XZ_DEC_BCJ is not set
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=y
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=y
 CONFIG_TEXTSEARCH_BM=y