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 b441a89..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,7 +111,9 @@ 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
@@ -145,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
@@ -184,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
@@ -199,7 +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 is not set
 CONFIG_DMI=y
 CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set
@@ -213,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
@@ -348,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
@@ -409,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
@@ -419,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
@@ -490,13 +491,13 @@ CONFIG_KEYS_COMPAT=y
 # 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
@@ -530,6 +531,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
@@ -564,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
@@ -616,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
@@ -728,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
@@ -794,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
@@ -855,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
@@ -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
@@ -939,20 +933,16 @@ CONFIG_TIGON3=m
 # CONFIG_USBPCWATCHDOG is not set
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
-# CONFIG_USB_GADGET is not set
-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
@@ -1096,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