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

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

diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config
index 944574d..3ec6a5b 100644 (file)
--- a/chromeos/config/i386/common.config
+++ b/chromeos/config/i386/common.config
@@ -48,7 +48,6 @@ CONFIG_AGP_INTEL=y
 # CONFIG_AIRO is not set
 # CONFIG_ALIX is not set
 CONFIG_AMD_NB=y
-# CONFIG_AMILO_RFKILL is not set
 # CONFIG_APM is not set
 # CONFIG_APPLE_GMUX is not set
 # CONFIG_APPLICOM is not set
@@ -143,7 +142,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_VDSO is not set
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_CPA_DEBUG is not set
@@ -188,8 +186,7 @@ CONFIG_DELL_WMI=m
 # CONFIG_DELL_WMI_AIO is not set
 CONFIG_DEVPORT=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
@@ -203,6 +200,7 @@ CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 # CONFIG_DRM_MGA is not set
+# CONFIG_DRM_PS8622 is not set
 # CONFIG_DRM_PTN3460 is not set
 # CONFIG_DRM_R128 is not set
 # CONFIG_DRM_SAVAGE is not set
@@ -392,7 +390,6 @@ CONFIG_I2C_PIIX4=m
 # 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
@@ -407,7 +404,6 @@ CONFIG_INSTRUCTION_DECODER=y
 # CONFIG_INTEL_IPS is not set
 CONFIG_INTEL_MENLOW=m
 # CONFIG_INTEL_MID_PTI is not set
-# CONFIG_INTEL_OAKTRAIL is not set
 # CONFIG_IOMMU_HELPER is not set
 # CONFIG_IOMMU_STRESS is not set
 # CONFIG_IO_DELAY_0X80 is not set
@@ -447,7 +443,6 @@ CONFIG_ISA_DMA_API=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_KTIME_SCALAR=y
@@ -503,6 +498,7 @@ CONFIG_MFD_CORE=m
 # 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
@@ -544,7 +540,6 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MPENTIUMII is not set
 # CONFIG_MPENTIUMIII is not set
 # CONFIG_MPENTIUMM is not set
-# CONFIG_MSI_LAPTOP is not set
 # CONFIG_MSI_WMI is not set
 CONFIG_MTRR=y
 # CONFIG_MTRR_SANITIZER is not set
@@ -886,7 +881,6 @@ CONFIG_SND_VMASTER=y
 # CONFIG_SND_VX222 is not set
 # CONFIG_SND_YMFPCI is not set
 # CONFIG_SONYPI is not set
-# CONFIG_SONY_LAPTOP is not set
 CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM_STATIC=y
@@ -913,7 +907,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 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