kernel: Update to 3.13.2.

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

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index df5064485722a0c6ed5acbc7a94378c9e79bd3c3..c6b9e21dc1cdc709f8d53a4ba761feb0444561d2 100644 (file)
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -14,7 +14,6 @@ CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_X86_HT=y
-CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 
 #
@@ -54,7 +53,6 @@ CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_OPROFILE_NMI_TIMER=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_USER_RETURN_NOTIFIER=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 
 #
@@ -106,8 +104,6 @@ CONFIG_CPU_SUP_CENTAUR=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_X86_LOCAL_APIC=y
@@ -135,6 +131,7 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_DISCARD_MEMBLOCK=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_VIRT_TO_BUS=y
@@ -169,13 +166,10 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 # Power management and ACPI options
 #
 CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_PROCFS=y
-# CONFIG_ACPI_PROCFS_POWER is not set
 CONFIG_ACPI_EC_DEBUGFS=m
 CONFIG_ACPI_AC=y
 CONFIG_ACPI_BATTERY=y
@@ -204,13 +198,13 @@ CONFIG_ACPI_APEI_PCIEAER=y
 CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 # CONFIG_ACPI_APEI_EINJ is not set
 # CONFIG_ACPI_APEI_ERST_DEBUG is not set
+CONFIG_ACPI_EXTLOG=m
 CONFIG_SFI=y
 
 #
 # CPU Frequency scaling
 #
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
@@ -249,6 +243,7 @@ CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_INTEL_IDLE=y
 
 #
@@ -272,10 +267,19 @@ CONFIG_PCI_LABEL=y
 #
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
+CONFIG_PCCARD=m
+# CONFIG_PCMCIA is not set
+CONFIG_CARDBUS=y
 
 #
 # PC-card bridges
 #
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
@@ -300,11 +304,23 @@ CONFIG_RFKILL_GPIO=m
 #
 # Generic Driver Options
 #
+# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_SYS_HYPERVISOR=y
+CONFIG_REGMAP_I2C=m
 
 #
 # Bus devices
 #
+# CONFIG_MTD is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+# CONFIG_PARPORT_GSC is not set
+# CONFIG_PARPORT_AX88796 is not set
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
 CONFIG_PNP=y
 # CONFIG_PNP_DEBUG_MESSAGES is not set
 
@@ -313,8 +329,9 @@ CONFIG_PNP=y
 #
 CONFIG_PNPACPI=y
 CONFIG_BLK_DEV_FD=m
+# CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_BLKDEV_BACKEND=m
 # CONFIG_BLK_DEV_HD is not set
@@ -324,6 +341,7 @@ CONFIG_XEN_BLKDEV_BACKEND=m
 #
 CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_VMWARE_BALLOON=m
+# CONFIG_SRAM is not set
 
 #
 # Altera FPGA firmware download module
@@ -347,9 +365,18 @@ CONFIG_SCSI_EATA_TAGGED_QUEUE=y
 CONFIG_SCSI_EATA_MAX_TAGS=16
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
 CONFIG_ATA_ACPI=y
 # CONFIG_SATA_ZPODD is not set
 
+#
+# PIO-only SFF controllers
+#
+# CONFIG_PATA_PLATFORM is not set
+
 #
 # Generic fallback / legacy drivers
 #
@@ -381,7 +408,9 @@ CONFIG_VHOST=m
 #
 # Distributed Switch Architecture drivers
 #
+CONFIG_VORTEX=m
 CONFIG_DE4X5=m
+CONFIG_PCMCIA_XIRCOM=m
 CONFIG_IGB_DCA=y
 CONFIG_IXGBE_DCA=y
 CONFIG_MLX4_EN=m
@@ -394,6 +423,11 @@ CONFIG_ATP=m
 CONFIG_SUNGEM=m
 # CONFIG_NET_SB1000 is not set
 
+#
+# MII PHY device drivers
+#
+# CONFIG_PLIP is not set
+
 #
 # USB Network Adapters
 #
@@ -412,10 +446,18 @@ CONFIG_HISAX_NETJET=y
 CONFIG_HISAX_NETJET_U=y
 CONFIG_HISAX_ENTERNOW_PCI=y
 
+#
+# Input device support
+#
+# CONFIG_INPUT_FF_MEMLESS is not set
+CONFIG_INPUT_MATRIXKMAP=m
+
 #
 # Input Device Drivers
 #
+# CONFIG_KEYBOARD_SAMSUNG is not set
 CONFIG_MOUSE_PS2_LIFEBOOK=y
+# CONFIG_MOUSE_GPIO is not set
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_ATLAS_BTNS=m
@@ -427,6 +469,7 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 #
 CONFIG_SERIO_I8042=y
 # CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
 
 #
 # Character devices
@@ -443,6 +486,11 @@ CONFIG_SERIAL_8250_DW=m
 #
 # Non-8250 serial port support
 #
+CONFIG_SERIAL_SCCNXP=m
+CONFIG_SERIAL_ARC=m
+CONFIG_PRINTER=m
+CONFIG_LP_CONSOLE=y
+CONFIG_PPDEV=m
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
 CONFIG_HVC_XEN_FRONTEND=y
@@ -454,6 +502,8 @@ CONFIG_HPET=y
 # CONFIG_HPET_MMAP is not set
 CONFIG_HANGCHECK_TIMER=m
 # CONFIG_TELCLOCK is not set
+CONFIG_I2C=m
+CONFIG_I2C_ALGOBIT=m
 
 #
 # PC SMBus host controller drivers
@@ -473,6 +523,16 @@ CONFIG_I2C_SCMI=m
 CONFIG_I2C_DESIGNWARE_CORE=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_PARPORT=m
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_PARPORT is not set
+
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
@@ -486,11 +546,13 @@ CONFIG_PINCTRL=y
 # CONFIG_PINCONF is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_PINCTRL_BAYTRAIL is not set
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIO_ACPI=y
 
 #
 # Memory mapped GPIO drivers:
 #
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_IT8761E is not set
 # CONFIG_GPIO_F7188X is not set
 CONFIG_GPIO_SCH=m
@@ -501,8 +563,14 @@ CONFIG_GPIO_ICH=m
 # PCI GPIO expanders:
 #
 # CONFIG_GPIO_CS5535 is not set
+# CONFIG_GPIO_INTEL_MID is not set
 # CONFIG_GPIO_PCH is not set
 
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MCP23S08 is not set
+
 #
 # Native drivers
 #
@@ -568,7 +636,17 @@ CONFIG_XEN_WDT=m
 #
 # Multifunction device drivers
 #
+CONFIG_MFD_CORE=m
 CONFIG_MFD_CS5535=m
+# CONFIG_ABX500_CORE is not set
+# CONFIG_MFD_SYSCON is not set
+# CONFIG_MFD_TPS65912 is not set
+# CONFIG_REGULATOR is not set
+
+#
+# Multimedia core support
+#
+CONFIG_VIDEO_V4L2=m
 
 #
 # Media drivers
@@ -596,6 +674,31 @@ CONFIG_SOC_CAMERA_SCALE_CROP=m
 CONFIG_VIDEO_SH_MOBILE_CSI2=m
 CONFIG_VIDEO_SH_MOBILE_CEU=m
 
+#
+# Supported MMC/SDIO adapters
+#
+# CONFIG_MEDIA_PARPORT_SUPPORT is not set
+
+#
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
+#
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# soc_camera sensor drivers
+#
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+
 #
 # Graphics support
 #
@@ -605,6 +708,9 @@ CONFIG_AGP_INTEL=y
 CONFIG_AGP_SIS=y
 CONFIG_AGP_VIA=y
 CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_USB=m
+CONFIG_DRM_KMS_HELPER=m
 
 #
 # I2C encoder or helper chips
@@ -620,15 +726,19 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_I810=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_I915_FBDEV=y
 # CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
 CONFIG_DRM_SIS=m
 CONFIG_DRM_GMA500=m
 CONFIG_DRM_GMA600=y
 CONFIG_DRM_GMA3600=y
+CONFIG_DRM_UDL=m
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 CONFIG_FB_BACKLIGHT=y
+# CONFIG_FB_MODE_HELPERS is not set
 
 #
 # Frame buffer hardware drivers
@@ -643,6 +753,7 @@ CONFIG_FB_BACKLIGHT=y
 # CONFIG_FB_INTEL is not set
 # CONFIG_FB_VIA is not set
 CONFIG_XEN_FBDEV_FRONTEND=m
+CONFIG_LCD_PLATFORM=m
 CONFIG_BACKLIGHT_APPLE=m
 # CONFIG_BACKLIGHT_SAHARA is not set
 
@@ -653,6 +764,8 @@ CONFIG_VGA_CONSOLE=y
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_SND_DMA_SGBUF=y
 CONFIG_SND_PCSP=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_SB_COMMON=m
 CONFIG_SND_SB16_DSP=m
 CONFIG_SND_ALS4000=m
@@ -660,23 +773,51 @@ CONFIG_SND_ALI5451=m
 CONFIG_SND_ASIHPI=m
 CONFIG_SND_CS5530=m
 CONFIG_SND_HDA_I915=y
+CONFIG_SND_LX6464ES=m
 CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_US122L=m
 # CONFIG_SND_SOC is not set
 
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_SAMSUNG_USBPHY=m
+CONFIG_SAMSUNG_USB2PHY=m
+CONFIG_SAMSUNG_USB3PHY=m
+CONFIG_MMC=m
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
+CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_ACPI=m
 CONFIG_MMC_WBSD=m
 
 #
 # LED drivers
 #
+# CONFIG_LEDS_GPIO is not set
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_DELL_NETBOOKS=m
 
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+
 #
 # iptables trigger is under Netfilter config (LED target)
 #
@@ -709,6 +850,7 @@ CONFIG_DMA_ACPI=y
 #
 # DMA Clients
 #
+CONFIG_DMA_ENGINE_RAID=y
 CONFIG_DCA=m
 # CONFIG_VFIO is not set
 
@@ -738,6 +880,7 @@ CONFIG_XEN_PRIVCMD=m
 CONFIG_XEN_ACPI_PROCESSOR=m
 CONFIG_XEN_HAVE_PVMMU=y
 # CONFIG_SLICOSS is not set
+# CONFIG_PANEL is not set
 
 #
 # Triggers - standalone
@@ -751,7 +894,6 @@ CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
 CONFIG_ASUS_LAPTOP=m
-CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
@@ -797,6 +939,8 @@ CONFIG_SAMSUNG_Q10=m
 # CONFIG_INTEL_RST is not set
 CONFIG_INTEL_SMARTCONNECT=m
 CONFIG_PVPANIC=m
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_COMMON_CLK=y
 
 #
@@ -843,6 +987,7 @@ CONFIG_ISCSI_IBFT=m
 CONFIG_EFI_VARS=y
 CONFIG_EFI_VARS_PSTORE=y
 # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
+CONFIG_UEFI_CPER=y
 
 #
 # File systems
@@ -874,6 +1019,14 @@ CONFIG_HARDLOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+
 #
 # RCU Debugging
 #
@@ -893,6 +1046,7 @@ CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK_EFI=y
 # CONFIG_X86_PTDUMP is not set
 CONFIG_DEBUG_NX_TEST=m
 CONFIG_DOUBLEFAULT=y
@@ -961,7 +1115,7 @@ CONFIG_LSM_MMAP_MIN_ADDR=65536
 #
 CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_ABLK_HELPER_X86=y
+CONFIG_CRYPTO_ABLK_HELPER=y
 
 #
 # Block modes
@@ -989,6 +1143,7 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
 CONFIG_KVM_APIC_ARCHITECTURE=y
 CONFIG_KVM_MMIO=y
 CONFIG_KVM_ASYNC_PF=y
+CONFIG_KVM_VFIO=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
@@ -1002,5 +1157,7 @@ CONFIG_RATIONAL=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_HAS_IOPORT=y
 CONFIG_CPU_RMAP=y
+# CONFIG_DDR is not set
 CONFIG_UCS2_STRING=y