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 79b6e34..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
@@ -93,6 +92,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
@@ -103,9 +105,12 @@ CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_RATE_CONTROL=y
 # CONFIG_ATMEL is not set
 # CONFIG_AUDIT_ARCH is not set
+# 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_BINFMT_AOUT is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_CPQ_DA is not set
@@ -137,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
@@ -168,7 +172,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
@@ -182,7 +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 is not set
 CONFIG_DMI=y
 CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set
@@ -196,6 +200,8 @@ 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
 # CONFIG_DRM_SIS is not set
@@ -326,7 +332,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_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
@@ -385,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
@@ -400,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,13 +450,13 @@ CONFIG_KTIME_SCALAR=y
 # CONFIG_LATENCYTOP is not set
 CONFIG_LBDAF=y
 # 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_LGUEST 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
@@ -464,6 +467,7 @@ CONFIG_LZO_DECOMPRESS=m
 # CONFIG_M586TSC is not set
 CONFIG_M686=y
 # CONFIG_MACINTOSH_DRIVERS is not set
+# CONFIG_MALI_T6XX is not set
 # CONFIG_MATH_EMULATION is not set
 # CONFIG_MATOM is not set
 # CONFIG_MCA is not set
@@ -494,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
@@ -535,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
@@ -707,16 +711,9 @@ CONFIG_RT2800PCI=m
 CONFIG_RT2800PCI_RT33XX=y
 CONFIG_RT2800PCI_RT35XX=y
 CONFIG_RT2800PCI_RT53XX=y
-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_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 +764,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
@@ -826,6 +825,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
@@ -881,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
@@ -907,9 +906,7 @@ CONFIG_TIGON3=m
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
-# CONFIG_USB_HSO is not set
-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
@@ -918,7 +915,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # 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
@@ -991,7 +988,6 @@ CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_RING=m
 CONFIG_VIRTUALIZATION=y
-# CONFIG_VITHAR is not set
 # CONFIG_VM86 is not set
 # CONFIG_VME_BUS is not set
 # CONFIG_VMSPLIT_1G is not set
@@ -1072,6 +1068,3 @@ CONFIG_XZ_DEC_X86=y
 CONFIG_ZONE_DMA=y
 # CONFIG_ZONE_DMA32 is not set
 CONFIG_ZONE_DMA_FLAG=1
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZSMALLOC=m