CHROMIUM: config: re-sync kernel config after dma-buf kds separation

[cascardo/linux.git] / chromeos / config / x86_64 / common.config

diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
index 5f04382..b41867a 100644 (file)
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -50,7 +50,6 @@ CONFIG_AGP_INTEL=y
 # CONFIG_ALIM7101_WDT is not set
 # CONFIG_AMD_IOMMU is not set
 CONFIG_AMD_NB=y
-# CONFIG_AMILO_RFKILL is not set
 # CONFIG_APPLE_GMUX is not set
 # CONFIG_APPLICOM is not set
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
@@ -99,6 +98,9 @@ CONFIG_ATH5K_PCI=y
 # CONFIG_ATH6KL is not set
 CONFIG_ATH9K=m
 # CONFIG_ATH9K_AHB is not set
+CONFIG_ATH9K_BTCOEX=m
+CONFIG_ATH9K_BTCOEX_COMMON=m
+CONFIG_ATH9K_BTCOEX_HW=m
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 CONFIG_ATH9K_COMMON=m
 CONFIG_ATH9K_DEBUGFS=y
@@ -109,9 +111,12 @@ CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_RATE_CONTROL=y
 # CONFIG_ATMEL is not set
 CONFIG_AUDIT_ARCH=y
+# CONFIG_AUXDISPLAY is not set
 # CONFIG_BACKLIGHT_APPLE is not set
+CONFIG_BACKLIGHT_CHROMEOS_KEYBOARD=y
 # CONFIG_BACKLIGHT_PROGEAR is not set
 # CONFIG_BACKLIGHT_SAHARA is not set
+# CONFIG_BATTERY_SBS is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
@@ -131,6 +136,7 @@ CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 # CONFIG_BT_HCIBTSDIO is not set
 # CONFIG_BT_HCIUART is not set
+# CONFIG_BT_MRVL is not set
 # CONFIG_CALGARY_IOMMU is not set
 # CONFIG_CB710_CORE is not set
 # CONFIG_CHARGER_GPIO is not set
@@ -143,7 +149,6 @@ CONFIG_CLOCKSOURCE_WATCHDOG=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CNIC is not set
 # CONFIG_COMEDI is not set
-# CONFIG_COMPAL_LAPTOP is not set
 CONFIG_COMPAT=y
 CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
@@ -161,6 +166,7 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_CPU_SUP_AMD=y
 CONFIG_CPU_SUP_CENTAUR=y
 CONFIG_CPU_SUP_INTEL=y
+# CONFIG_CPU_THERMAL is not set
 # CONFIG_CRASH_DUMP is not set
 # CONFIG_CRC8 is not set
 CONFIG_CRYPTO_AES_NI_INTEL=m
@@ -181,7 +187,7 @@ CONFIG_DCACHE_WORD_ACCESS=y
 # CONFIG_DCDBAS is not set
 CONFIG_DEBUG_BOOT_PARAMS=y
 # CONFIG_DEBUG_NMI_SELFTEST is not set
-# CONFIG_DEBUG_NX_TEST is not set
+CONFIG_DEBUG_NX_TEST=m
 CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set
 CONFIG_DEBUG_SET_MODULE_RONX=y
@@ -195,7 +201,8 @@ CONFIG_DELL_WMI=m
 # CONFIG_DELL_WMI_AIO is not set
 CONFIG_DEVPORT=y
 CONFIG_DIRECT_GBPAGES=y
-CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMADEVICES is not set
+# CONFIG_DMA_SHARED_BUFFER_USES_KDS is not set
 CONFIG_DMI=y
 CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set
@@ -209,6 +216,8 @@ CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 # CONFIG_DRM_MGA is not set
 # CONFIG_DRM_NOUVEAU is not set
+# CONFIG_DRM_PS8622 is not set
+# CONFIG_DRM_PTN3460 is not set
 # CONFIG_DRM_R128 is not set
 # CONFIG_DRM_RADEON is not set
 # CONFIG_DRM_SAVAGE is not set
@@ -233,6 +242,7 @@ CONFIG_EFI=y
 # CONFIG_ET131X is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_EXYNOS_VIDEO is not set
 # CONFIG_F71808E_WDT is not set
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_ARC is not set
@@ -299,7 +309,7 @@ CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GOOGLE_FIRMWARE=y
 CONFIG_GOOGLE_MEMCONSOLE=m
-# CONFIG_GOOGLE_SMI is not set
+CONFIG_GOOGLE_SMI=y
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_IT8761E is not set
 # CONFIG_GPIO_LANGWELL is not set
@@ -311,6 +321,7 @@ CONFIG_GPIO_NM10=m
 # CONFIG_GPIO_VX855 is not set
 # CONFIG_HANGCHECK_TIMER is not set
 CONFIG_HARDLOCKUP_DETECTOR=y
+CONFIG_HAS_IOPORT=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 # CONFIG_HAVE_AOUT is not set
 CONFIG_HAVE_ARCH_KMEMCHECK=y
@@ -318,7 +329,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_BPF_JIT=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_FTRACE_NMI_ENTER=y
 CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
@@ -343,7 +353,6 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 # CONFIG_HERMES is not set
 # CONFIG_HIBERNATION is not set
-CONFIG_HID_MICROSOFT=m
 CONFIG_HID_PID=y
 # CONFIG_HIPPI is not set
 CONFIG_HOSTAP_PCI=m
@@ -404,7 +413,6 @@ CONFIG_IA32_EMULATION=y
 # CONFIG_IBM_ASM is not set
 # CONFIG_IBM_RTL is not set
 # CONFIG_IDE is not set
-# CONFIG_IDEAPAD_LAPTOP is not set
 # CONFIG_IDE_PHISON is not set
 # CONFIG_IGB is not set
 CONFIG_IGBVF=m
@@ -414,13 +422,11 @@ CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 # CONFIG_INPUT_ATLAS_BTNS is not set
 CONFIG_INPUT_SPARSEKMAP=m
 CONFIG_INSTRUCTION_DECODER=y
-# CONFIG_INTEL_IDLE is not set
 # CONFIG_INTEL_IOMMU is not set
 # CONFIG_INTEL_IPS is not set
 # CONFIG_INTEL_MEI is not set
 CONFIG_INTEL_MENLOW=m
 # CONFIG_INTEL_MID_PTI is not set
-# CONFIG_INTEL_OAKTRAIL is not set
 # CONFIG_IOMMU_DEBUG is not set
 CONFIG_IOMMU_HELPER=y
 # CONFIG_IOMMU_STRESS is not set
@@ -479,35 +485,58 @@ CONFIG_IWLWIFI_DEVICE_TESTMODE=y
 # CONFIG_IXGBEVF is not set
 CONFIG_JME=m
 # CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KEYBOARD_MKBP is not set
 CONFIG_KEYS_COMPAT=y
 # CONFIG_KTIME_SCALAR is not set
 # CONFIG_KVM is not set
 # CONFIG_LATENCYTOP is not set
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_LEDS_CHROMEOS_KEYBOARD=y
 # CONFIG_LEDS_CLEVO_MAIL is not set
 # CONFIG_LEDS_DELL_NETBOOKS is not set
 # CONFIG_LEDS_INTEL_SS4200 is not set
 # CONFIG_LIBERTAS is not set
 CONFIG_LIBERTAS_THINFIRM_USB=m
 CONFIG_LIRC=m
-CONFIG_LOW_MEM_NOTIFY=y
 CONFIG_LPC_SCH=m
 CONFIG_LZO_COMPRESS=m
 CONFIG_LZO_DECOMPRESS=m
 # CONFIG_MACHZ_WDT is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
+# CONFIG_MALI_T6XX is not set
 # CONFIG_MATOM is not set
 # CONFIG_MAXSMP is not set
 # CONFIG_MCORE2 is not set
+# CONFIG_MEDIA_CONTROLLER is not set
+CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_XC5000=m
 # CONFIG_MEMORY_FAILURE is not set
 # CONFIG_MEMORY_HOTPLUG is not set
 # CONFIG_MEMTEST is not set
+# CONFIG_MFD_CHROMEOS_EC is not set
 CONFIG_MFD_CORE=m
 # CONFIG_MFD_CS5535 is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_S5M_CORE is not set
 # CONFIG_MFD_TIMBERDALE is not set
+# CONFIG_MFD_TPS65090 is not set
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_MFD_VX855 is not set
+# CONFIG_MFD_WM8994 is not set
 CONFIG_MICROCODE=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_INTEL=y
@@ -537,7 +566,6 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MPSC is not set
-# CONFIG_MSI_LAPTOP is not set
 # CONFIG_MSI_WMI is not set
 CONFIG_MTRR=y
 # CONFIG_MTRR_SANITIZER is not set
@@ -589,7 +617,6 @@ CONFIG_NF_CONNTRACK_PROCFS=y
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 # CONFIG_NOZOMI is not set
 CONFIG_NO_BOOTMEM=y
-CONFIG_NR_CPUS=4
 # CONFIG_NUMA is not set
 CONFIG_NVRAM=y
 # CONFIG_NV_TCO is not set
@@ -701,18 +728,10 @@ CONFIG_REALTEK_AUTOPM=y
 # CONFIG_RT2500PCI is not set
 # CONFIG_RT2500USB is not set
 CONFIG_RT2800PCI=m
-# CONFIG_RT2800USB is not set
-CONFIG_RT2800_LIB=m
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_CRYPTO=y
-# CONFIG_RT2X00_LIB_DEBUGFS is not set
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_LEDS=y
 CONFIG_RT2X00_LIB_PCI=m
 # CONFIG_RT61PCI is not set
 # CONFIG_RT73USB is not set
-CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_HCTOSYS is not set
 # CONFIG_RTL8180 is not set
 CONFIG_RTL8192CE=m
@@ -767,6 +786,8 @@ CONFIG_SENSORS_CORETEMP=y
 # CONFIG_SENSORS_I5K_AMB is not set
 # CONFIG_SENSORS_K10TEMP is not set
 # CONFIG_SENSORS_K8TEMP is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VIA_CPUTEMP is not set
@@ -819,7 +840,7 @@ CONFIG_SND_DMA_SGBUF=y
 # CONFIG_SND_GINA24 is not set
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_CA0110=y
-CONFIG_SND_HDA_CODEC_CA0132=y
+# CONFIG_SND_HDA_CODEC_CA0132 is not set
 CONFIG_SND_HDA_CODEC_CIRRUS=y
 CONFIG_SND_HDA_CODEC_CMEDIA=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
@@ -828,6 +849,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=y
 CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_DSP_LOADER=y
 CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
 CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_HWDEP=y
@@ -836,7 +858,7 @@ CONFIG_SND_HDA_INPUT_JACK=y
 CONFIG_SND_HDA_INTEL=m
 # CONFIG_SND_HDA_PATCH_LOADER is not set
 CONFIG_SND_HDA_POWER_SAVE=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=5
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=15
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 # CONFIG_SND_HDA_RECONFIG is not set
 # CONFIG_SND_HDSP is not set
@@ -882,7 +904,6 @@ CONFIG_SND_VMASTER=y
 # CONFIG_SND_VX222 is not set
 # CONFIG_SND_YMFPCI is not set
 # CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SONY_LAPTOP is not set
 # CONFIG_SP5100_TCO is not set
 CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
@@ -896,6 +917,7 @@ CONFIG_SPARSE_IRQ=y
 # CONFIG_STUB_POULSBO is not set
 CONFIG_SWIOTLB=y
 CONFIG_SYSVIPC_COMPAT=y
+# CONFIG_TCG_ATMEL is not set
 # CONFIG_TCG_INFINEON is not set
 # CONFIG_TCG_NSC is not set
 CONFIG_TCG_TIS=y
@@ -911,31 +933,83 @@ CONFIG_TIGON3=m
 # CONFIG_USBPCWATCHDOG is not set
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
-CONFIG_USB_HSO=y
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_NET1080=m
+# CONFIG_USB_DWC3 is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OHCI_HCD_PLATFORM is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_SERIAL_FTDI_SIO is not set
 CONFIG_USB_STORAGE_REALTEK=y
 CONFIG_USB_UHCI_HCD=y
-CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 # CONFIG_UWB is not set
+# CONFIG_V4L_MEM2MEM_DRIVERS is not set
 # CONFIG_V4L_PCI_DRIVERS is not set
+# CONFIG_V4L_PLATFORM_DRIVERS is not set
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 # CONFIG_VGA_ARB is not set
 CONFIG_VGA_CONSOLE=y
 # CONFIG_VGA_SWITCHEROO is not set
 # CONFIG_VHOST_NET is not set
 # CONFIG_VIA_WDT is not set
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_CS5345 is not set
+# CONFIG_VIDEO_CS53L32A is not set
 # CONFIG_VIDEO_CX231XX is not set
+# CONFIG_VIDEO_CX2341X is not set
+# CONFIG_VIDEO_CX25840 is not set
+CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
 # CONFIG_VIDEO_IR_I2C is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_M52790 is not set
+CONFIG_VIDEO_MEDIA=m
+# CONFIG_VIDEO_MSP3400 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_SAA6588 is not set
+# CONFIG_VIDEO_SAA7110 is not set
+# CONFIG_VIDEO_SAA711X is not set
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA717X is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_SAA7191 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_TCM825X is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_TLV320AIC23B is not set
 # CONFIG_VIDEO_TM6000 is not set
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_TVP514X is not set
+# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_TVP7002 is not set
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L2_COMMON=m
+# CONFIG_VIDEO_VP27SMPX is not set
+# CONFIG_VIDEO_VPX3220 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_WM8775 is not set
 CONFIG_VIRTIO=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_VIRTIO_CONSOLE is not set
@@ -1012,6 +1086,3 @@ CONFIG_XZ_DEC_X86=y
 CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA32=y
 CONFIG_ZONE_DMA_FLAG=1
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZSMALLOC=m