kernel: Update to version 4.1.3

[ipfire-3.x.git] / kernel / config-x86-generic

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 6f3ba6908aeba72bd6bb7eb685b7c3813fa29228..ed613edb7fa33fbeb8662197cd33b4688cea69a4 100644 (file)
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -55,7 +55,6 @@ CONFIG_RCU_NOCB_CPU=y
 CONFIG_RCU_NOCB_CPU_ALL=y
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_UID16=y
 CONFIG_PCSPKR_PLATFORM=y
 
 #
@@ -67,7 +66,6 @@ CONFIG_OPROFILE_NMI_TIMER=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_OLD_SIGSUSPEND3=y
 
 #
 # IO Schedulers
@@ -102,7 +100,6 @@ CONFIG_KVM_GUEST=y
 # CONFIG_KVM_DEBUG_FS is not set
 CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_MEMTEST is not set
 # CONFIG_MK8 is not set
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
@@ -122,7 +119,6 @@ CONFIG_DMI=y
 CONFIG_NR_CPUS=64
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
-CONFIG_X86_UP_APIC_MSI=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
@@ -137,8 +133,6 @@ CONFIG_MICROCODE=m
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
-# CONFIG_MICROCODE_INTEL_EARLY is not set
-# CONFIG_MICROCODE_AMD_EARLY is not set
 # CONFIG_X86_MSR is not set
 CONFIG_X86_CPUID=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
@@ -159,6 +153,7 @@ CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
+CONFIG_X86_PMEM_LEGACY=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_RESERVE_LOW=64
@@ -187,6 +182,7 @@ CONFIG_HOTPLUG_CPU=y
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_CMDLINE_BOOL is not set
+# CONFIG_DEFAULT_MODIFY_LDT_SYSCALL is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
 #
@@ -196,9 +192,10 @@ CONFIG_PM_SLEEP_SMP=y
 CONFIG_ACPI=y
 CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
 CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
+CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS_POWER is not set
-CONFIG_ACPI_EC_DEBUGFS=m
+# CONFIG_ACPI_EC_DEBUGFS is not set
 CONFIG_ACPI_AC=y
 CONFIG_ACPI_BATTERY=y
 CONFIG_ACPI_BUTTON=y
@@ -273,6 +270,7 @@ CONFIG_PCIE_ECRC=y
 CONFIG_PCIEAER_INJECT=m
 # CONFIG_PCIEASPM_DEFAULT is not set
 CONFIG_PCIEASPM_POWERSAVE=y
+CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_STUB=y
 CONFIG_HT_IRQ=y
@@ -394,10 +392,7 @@ CONFIG_VMWARE_VMCI=m
 # SCSI Transports
 #
 CONFIG_AIC79XX_RESET_DELAY_MS=4000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
-# CONFIG_AIC94XX_DEBUG is not set
-# CONFIG_SCSI_MVSAS_DEBUG is not set
 CONFIG_SCSI_MVSAS_TASKLET=y
 CONFIG_SCSI_DPT_I2O=m
 CONFIG_SCSI_ADVANSYS=m
@@ -462,6 +457,7 @@ CONFIG_VHOST=m
 #
 CONFIG_VORTEX=m
 CONFIG_AMD8111_ETH=m
+CONFIG_MACB=m
 CONFIG_BNX2X_SRIOV=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CX_ECAT=m
@@ -496,7 +492,6 @@ CONFIG_NET_SB1000=m
 #
 # CONFIG_PLIP is not set
 CONFIG_AIRO=m
-CONFIG_ATH5K_DEBUG=y
 # CONFIG_WIL6210_TRACING is not set
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200_MONITOR=y
@@ -520,8 +515,8 @@ CONFIG_INPUT_MATRIXKMAP=m
 #
 CONFIG_KEYBOARD_ADP5520=m
 CONFIG_KEYBOARD_SAMSUNG=m
-CONFIG_KEYBOARD_TC3589X=m
 CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_VMMOUSE=y
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_GPIO_BEEPER=m
@@ -637,32 +632,32 @@ CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AMD=y
 # CONFIG_PINCTRL_BAYTRAIL is not set
 CONFIG_PINCTRL_CHERRYVIEW=m
+CONFIG_PINCTRL_INTEL=m
+CONFIG_PINCTRL_SUNRISEPOINT=m
 CONFIG_GPIO_ACPI=y
+CONFIG_GPIO_GENERIC=m
 
 #
-# Memory mapped GPIO drivers:
+# Memory mapped GPIO drivers
 #
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_IT8761E is not set
+CONFIG_GPIO_DWAPB=m
 # CONFIG_GPIO_F7188X is not set
-CONFIG_GPIO_SCH=m
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
 CONFIG_GPIO_ICH=m
+# CONFIG_GPIO_IT8761E is not set
 # CONFIG_GPIO_LYNXPOINT is not set
+CONFIG_GPIO_SCH=m
 
 #
-# PCI GPIO expanders:
+# PCI GPIO expanders
 #
 # CONFIG_GPIO_INTEL_MID is not set
 
 #
-# SPI GPIO expanders:
-#
-CONFIG_GPIO_MCP23S08=m
-
-#
-# USB GPIO expanders:
+# USB GPIO expanders
 #
 CONFIG_MAX8925_POWER=m
 CONFIG_WM831X_BACKUP=m
@@ -748,6 +743,7 @@ CONFIG_WDTPCI=m
 #
 # Multifunction device drivers
 #
+CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
 CONFIG_LPC_ICH=m
 CONFIG_MFD_RTSX_PCI=m
 # CONFIG_ABX500_CORE is not set
@@ -928,6 +924,7 @@ CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_I2C_SIL164 is not set
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_USERPTR is not set
 # CONFIG_DRM_RADEON_UMS is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_DEBUG=5
@@ -1003,11 +1000,6 @@ CONFIG_MUSB_PIO_ONLY=y
 CONFIG_USB_USS720=m
 CONFIG_USB_SERIAL_MOS7715_PARPORT=y
 
-#
-# USB Physical Layer drivers
-#
-CONFIG_NOP_USB_XCEIV=m
-
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
@@ -1059,8 +1051,8 @@ CONFIG_RTC_DRV_CMOS=y
 #
 # DMA Devices
 #
-# CONFIG_INTEL_MID_DMAC is not set
 CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
 CONFIG_DMA_ACPI=y