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 e4ec889..b41867a 100644 (file)
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -149,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
@@ -203,8 +202,7 @@ CONFIG_DELL_WMI=m
 CONFIG_DEVPORT=y
 CONFIG_DIRECT_GBPAGES=y
 # CONFIG_DMADEVICES is not set
-CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DMA_SHARED_BUFFER_USES_KDS=y
+# CONFIG_DMA_SHARED_BUFFER_USES_KDS is not set
 CONFIG_DMI=y
 CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set
@@ -218,6 +216,7 @@ 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
@@ -414,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
@@ -429,7 +427,6 @@ CONFIG_INSTRUCTION_DECODER=y
 # 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
@@ -487,7 +484,6 @@ CONFIG_IWLWIFI_DEVICE_TESTMODE=y
 # CONFIG_IXGBE is not set
 # CONFIG_IXGBEVF is not set
 CONFIG_JME=m
-CONFIG_KDS=y
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KEYBOARD_MKBP is not set
 CONFIG_KEYS_COMPAT=y
@@ -570,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
@@ -909,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
@@ -940,7 +934,6 @@ CONFIG_TIGON3=m
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
 # CONFIG_USB_DWC3 is not set
-CONFIG_USB_HSO=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=y