CHROMIUM: config: renormalize splitconfig after exynos merge

[cascardo/linux.git] / chromeos / config / base.config

diff --git a/chromeos/config/base.config b/chromeos/config/base.config
index f7970b9..4d6e053 100644 (file)
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -213,10 +213,12 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
 # CONFIG_CPUSETS is not set
 CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_GOV_INTERACTIVE is not set
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -225,6 +227,7 @@ CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_TABLE=y
 # CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
 CONFIG_CPU_RMAP=y
+# CONFIG_CPU_THERMAL is not set
 # CONFIG_CRAMFS is not set
 CONFIG_CRC16=y
 CONFIG_CRC32=y
@@ -450,6 +453,7 @@ CONFIG_FB=y
 # CONFIG_FB_METRONOME is not set
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_S3C is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_FB_SMSCUFX is not set
 # CONFIG_FB_SVGALIB is not set
@@ -528,6 +532,7 @@ CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -837,6 +842,7 @@ CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
 # CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MKBP is not set
 # CONFIG_KEYBOARD_MPR121 is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_OMAP4 is not set
@@ -953,8 +959,10 @@ CONFIG_MEDIA_TUNER_XC5000=m
 # CONFIG_MEMSTICK is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_CHROMEOS_EC is not set
 # CONFIG_MFD_DA9052_I2C is not set
 # CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX8925 is not set
 # CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_MAX8998 is not set
@@ -1873,6 +1881,7 @@ CONFIG_VIDEO_V4L2_COMMON=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRT_TO_BUS=y
 # CONFIG_VITESSE_PHY is not set
+# CONFIG_VITHAR is not set
 # CONFIG_VLAN_8021Q is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_VT=y