[9610][ERD] arm64: config: run savedefconfig

Change-Id: Id0ed40ae56e28857f337c19e75357bc868cccbd9
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

diff --git a/arch/arm64/configs/erd9610_defconfig b/arch/arm64/configs/erd9610_defconfig
index 4f03222c8c3b3f4cc49b38e4794108817c19128b..63d79fdc1ebec84ef722b8e446850cb44af1a860 100644 (file)
--- a/arch/arm64/configs/erd9610_defconfig
+++ b/arch/arm64/configs/erd9610_defconfig
@@ -5,10 +5,6 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
-CONFIG_NANOHUB=y
-CONFIG_NANOHUB_MAILBOX=y
-CONFIG_CHRE_SENSORHUB_HAL=y
-CONFIG_CONTEXTHUB_DEBUG=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -306,11 +302,8 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_EXYNOS_MFC=y
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_EXYNOS_SCALER=y
-CONFIG_VIDEO_EXYNOS_SMFC=y
-CONFIG_RADIO_S5E9610=y
-CONFIG_RADIO_S610=y
+CONFIG_VIDEO_EXYNOS_CAMERA_POSTPROCESS=y
+CONFIG_CAMERA_PP_GDC_V2_0_0_OBJ=y
 CONFIG_VIDEO_EXYNOS_FIMC_IS2=y
 CONFIG_USE_CSI_DMAOUT_FEATURE=y
 CONFIG_CAMERA_CIS_6B2_OBJ=y
@@ -319,8 +312,11 @@ CONFIG_CAMERA_CIS_2T7SX_OBJ=y
 CONFIG_CAMERA_ACT_LC898217_OBJ=y
 CONFIG_CAMERA_FLASH_GPIO_OBJ=y
 CONFIG_USE_SENSOR_GROUP=y
-CONFIG_VIDEO_EXYNOS_CAMERA_POSTPROCESS=y
-CONFIG_CAMERA_PP_GDC_V2_0_0_OBJ=y
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_EXYNOS_SCALER=y
+CONFIG_VIDEO_EXYNOS_SMFC=y
+CONFIG_RADIO_S5E9610=y
+CONFIG_RADIO_S610=y
 CONFIG_MALI_THEX=y
 CONFIG_MALI_MIDGARD=y
 CONFIG_MALI_EXPERT=y
@@ -330,8 +326,6 @@ CONFIG_EXYNOS_GRAPHICS_G2D=y
 CONFIG_FB=y
 CONFIG_FB_SIMPLE=y
 CONFIG_EXYNOS_DPU20=y
-# CONFIG_EXYNOS_WINDOW_UPDATE is not set
-# CONFIG_EXYNOS_HIBERNATION is not set
 # CONFIG_EXYNOS_DSIM_DITHER is not set
 CONFIG_EXYNOS_DECON_LCD=y
 CONFIG_EXYNOS_DECON_LCD_S6E3FA0=y
@@ -440,6 +434,10 @@ CONFIG_RTC_DRV_S2MPU09=y
 CONFIG_DMADEVICES=y
 CONFIG_SW_SYNC=y
 CONFIG_STAGING=y
+CONFIG_NANOHUB=y
+CONFIG_NANOHUB_MAILBOX=y
+CONFIG_CHRE_SENSORHUB_HAL=y
+CONFIG_CONTEXTHUB_DEBUG=y
 CONFIG_ASHMEM=y
 CONFIG_ION=y
 CONFIG_ION_EXYNOS=y
@@ -465,7 +463,6 @@ CONFIG_EXYNOS_KERNEL_PROTECTION=y
 CONFIG_PM_DEVFREQ=y
 CONFIG_ARM_EXYNOS_DEVFREQ=y
 CONFIG_ARM_EXYNOS_DEVFREQ_DEBUG=y
-CONFIG_IIO=y
 CONFIG_EXTCON=y
 CONFIG_EXYNOS_ADC=y
 CONFIG_PWM=y