- ressurect pc speaker driver

[packages/kernel.git] / kernel-multiarch.config

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 6844b9406666b81345139a8786e1da2693ef319d..758ee4aa4c213c6972255c4a4366069e09590d0d 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -3,9 +3,11 @@
 #- *** FILE: arch/* - ARCH SPECIFIC OPTIONS ***
 #-
 AMD_NUMA all=y
+BOOTPARAM_HOTPLUG_CPU0 all=n
 CPU_SUP_AMD all=y
 CPU_SUP_CENTAUR all=y
 CPU_SUP_INTEL all=y
+DEBUG_HOTPLUG_CPU0 all=n
 DEBUG_NMI_SELFTEST all=n
 DEBUG_SET_MODULE_RONX all=y
 DEBUG_STRICT_USER_COPY_CHECKS all=n
@@ -139,6 +141,7 @@ CRYPTO_BLOWFISH all=m
 CRYPTO_BLOWFISH_X86_64 all=m
 CRYPTO_CAMELLIA all=m
 CRYPTO_CAMELLIA_X86_64 all=m
+CRYPTO_CAMELLIA_AESNI_AVX_X86_64 all=m
 CRYPTO_CAST5 all=m
 CRYPTO_CAST5_AVX_X86_64 all=m
 CRYPTO_CAST6 all=m
@@ -208,6 +211,7 @@ ACPI_THERMAL all=m
 ACPI_NUMA ia64=y x86_64=y
 ACPI_CUSTOM_DSDT_FILE all=""
 ACPI_CUSTOM_DSDT all=n
+ACPI_INITRD_TABLE_OVERRIDE all=y
 ACPI_BLACKLIST_YEAR all=0
 ACPI_DEBUG all=n
 ACPI_PCI_SLOT all=m
@@ -390,6 +394,7 @@ BCMA all=m
 BCMA_HOST_PCI_POSSIBLE all=y
 BCMA_HOST_PCI all=y
 BCMA_DRIVER_GMAC_CMN all=y
+BCMA_DRIVER_GPIO all=y
 BCMA_DEBUG all=n
 
 #-
@@ -435,7 +440,7 @@ BLK_DEV_RBD all=m
 #-
 #- *** FILE: drivers/block/drbd/Kconfig ***
 #-
-#- DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#- DRBD disabled because PROC_FS or INET not selected
 BLK_DEV_DRBD all=m
 DRBD_FAULT_INJECTION all=n
 
@@ -622,15 +627,15 @@ CPU_FREQ all=y
 CPU_FREQ_TABLE all=m ppc=y ppc64=y
 CPU_FREQ_STAT all=m
 CPU_FREQ_STAT_DETAILS all=y
-CPU_FREQ_DEFAULT_GOV_PERFORMANCE all=y
+CPU_FREQ_DEFAULT_GOV_PERFORMANCE all=n
 CPU_FREQ_DEFAULT_GOV_POWERSAVE all=n
 CPU_FREQ_DEFAULT_GOV_USERSPACE all=n
-CPU_FREQ_DEFAULT_GOV_ONDEMAND all=n
+CPU_FREQ_DEFAULT_GOV_ONDEMAND all=y
 CPU_FREQ_DEFAULT_GOV_CONSERVATIVE all=n
-CPU_FREQ_GOV_PERFORMANCE all=y
+CPU_FREQ_GOV_PERFORMANCE all=m
 CPU_FREQ_GOV_POWERSAVE all=m
 CPU_FREQ_GOV_USERSPACE all=m
-CPU_FREQ_GOV_ONDEMAND all=m
+CPU_FREQ_GOV_ONDEMAND all=y
 CPU_FREQ_GOV_CONSERVATIVE all=m
 #- file drivers/cpufreq/Kconfig.x86 goes here
 #- file drivers/cpufreq/Kconfig.arm goes here
@@ -640,6 +645,7 @@ CPU_FREQ_GOV_CONSERVATIVE all=m
 #- *** FILE: drivers/cpuidle/Kconfig ***
 #-
 CPU_IDLE i386=y sparc64=n x86_64=y
+CPU_IDLE_MULTIPLE_DRIVERS all=y
 
 #-
 #- *** FILE: drivers/crypto/Kconfig ***
@@ -688,7 +694,6 @@ DMATEST all=n
 #- *** FILE: drivers/edac/Kconfig ***
 #-
 EDAC all=y
-#- Reporting subsystems
 EDAC_LEGACY_SYSFS all=y
 EDAC_DEBUG all=n
 EDAC_DECODE_MCE all=m
@@ -737,7 +742,7 @@ EXTCON_ARIZONA all=m
 #-
 #- *** FILE: drivers/firewire/Kconfig ***
 #-
-FIREWIRE all=n ia64=m ppc=m ppc64=m x86_64=m
+FIREWIRE all=m
 FIREWIRE_OHCI all=m
 FIREWIRE_SBP2 all=m
 FIREWIRE_NET all=m
@@ -776,6 +781,7 @@ GPIO_DA9052 all=m
 #- Memory mapped GPIO drivers:
 GPIO_GENERIC_PLATFORM all=m
 GPIO_IT8761E all=m
+GPIO_TS5500 all=m
 GPIO_XILINX powerpc=y
 GPIO_SCH all=m
 GPIO_ICH all=m
@@ -811,6 +817,8 @@ GPIO_74X164 all=m
 GPIO_UCB1400 all=y
 #- MODULbus GPIO expanders:
 GPIO_JANZ_TTL all=m
+#- USB GPIO expanders:
+GPIO_VIPERBOARD all=m
 
 #-
 #- *** FILE: drivers/gpu/drm/Kconfig ***
@@ -837,6 +845,7 @@ DRM_SAVAGE all=m
 #- file drivers/gpu/drm/mgag200/Kconfig goes here
 #- file drivers/gpu/drm/cirrus/Kconfig goes here
 #- file drivers/gpu/drm/shmobile/Kconfig goes here
+#- file drivers/gpu/drm/tegra/Kconfig goes here
 
 #-
 #- *** FILE: drivers/gpu/drm/ast/Kconfig ***
@@ -927,6 +936,7 @@ HID_KYE all=m
 HID_UCLOGIC all=m
 HID_WALTOP all=m
 HID_GYRATION all=m
+HID_ICADE all=m
 HID_TWINHAN all=m
 HID_KENSINGTON all=m
 HID_LCPOWER all=m
@@ -976,6 +986,12 @@ ZEROPLUS_FF all=y
 HID_ZYDACRON all=m
 HID_SENSOR_HUB all=m
 #- file drivers/hid/usbhid/Kconfig goes here
+#- file drivers/hid/i2c-hid/Kconfig goes here
+
+#-
+#- *** FILE: drivers/hid/i2c-hid/Kconfig ***
+#-
+I2C_HID all=m
 
 #-
 #- *** FILE: drivers/hid/usbhid/Kconfig ***
@@ -1004,6 +1020,7 @@ HSI_CHAR all=m
 #-
 HYPERV all=m
 HYPERV_UTILS all=m
+HYPERV_BALLOON all=m
 
 #-
 #- *** FILE: drivers/hwmon/Kconfig ***
@@ -1198,6 +1215,7 @@ I2C_SCMI all=m
 I2C_HYDRA ppc=m
 I2C_POWERMAC ppc=m ppc64=m
 #- I2C system bus drivers (mostly embedded / system-on-chip)
+I2C_CBUS_GPIO all=m
 I2C_DESIGNWARE_PCI all=m
 I2C_EG20T all=m
 I2C_GPIO all=m
@@ -1215,6 +1233,7 @@ I2C_PARPORT all=m
 I2C_PARPORT_LIGHT all=m
 I2C_TAOS_EVM all=m
 I2C_TINY_USB all=m
+I2C_VIPERBOARD all=m
 #- Other I2C/SMBus bus drivers
 I2C_ELEKTOR i386=m
 I2C_PCA_ISA all=m
@@ -1314,17 +1333,19 @@ I7300_IDLE x86_64=m
 #- *** FILE: drivers/iio/Kconfig ***
 #-
 IIO all=m
+IIO_BUFFER_CB all=y
 IIO_KFIFO_BUF all=m
 IIO_TRIGGER all=y
 IIO_CONSUMERS_PER_TRIGGER all=2
 #- file drivers/iio/accel/Kconfig goes here
 #- file drivers/iio/adc/Kconfig goes here
 #- file drivers/iio/amplifiers/Kconfig goes here
-#- file drivers/iio/light/Kconfig goes here
-#- file drivers/iio/frequency/Kconfig goes here
-#- file drivers/iio/dac/Kconfig goes here
 #- file drivers/iio/common/Kconfig goes here
+#- file drivers/iio/dac/Kconfig goes here
+#- file drivers/iio/frequency/Kconfig goes here
 #- file drivers/iio/gyro/Kconfig goes here
+#- file drivers/iio/imu/Kconfig goes here
+#- file drivers/iio/light/Kconfig goes here
 #- file drivers/iio/magnetometer/Kconfig goes here
 
 #-
@@ -1336,8 +1357,15 @@ HID_SENSOR_ACCEL_3D all=m
 #- *** FILE: drivers/iio/adc/Kconfig ***
 #-
 AD7266 all=m
+AD7298 all=m
 AD7791 all=m
+AD7793 all=m
 AD7476 all=m
+AD7887 all=m
+MAX1363 all=m
+TI_ADC081C all=m
+TI_AM335X_ADC all=m
+VIPERBOARD_ADC all=m
 
 #-
 #- *** FILE: drivers/iio/amplifiers/Kconfig ***
@@ -1347,7 +1375,7 @@ AD8366 all=m
 #-
 #- *** FILE: drivers/iio/common/hid-sensors/Kconfig ***
 #-
-HID_SENSOR_ENUM_BASE_QUIRKS all=m
+HID_SENSOR_ENUM_BASE_QUIRKS all=y
 
 #-
 #- *** FILE: drivers/iio/dac/Kconfig ***
@@ -1358,6 +1386,7 @@ AD5380 all=m
 AD5421 all=m
 AD5624R_SPI all=m
 AD5446 all=m
+AD5449 all=m
 AD5504 all=m
 AD5755 all=m
 AD5764 all=m
@@ -1375,8 +1404,14 @@ ADF4350 all=m
 #-
 #- *** FILE: drivers/iio/gyro/Kconfig ***
 #-
+ADIS16136 all=m
 HID_SENSOR_GYRO_3D all=m
 
+#-
+#- *** FILE: drivers/iio/imu/Kconfig ***
+#-
+ADIS16480 all=m
+
 #-
 #- *** FILE: drivers/iio/light/Kconfig ***
 #-
@@ -1596,6 +1631,7 @@ INPUT_AB8500_PONKEY all=m
 INPUT_AD714X all=m
 INPUT_AD714X_I2C all=m
 INPUT_AD714X_SPI all=m
+INPUT_ARIZONA_HAPTICS all=m
 INPUT_BMA150 all=m
 INPUT_PCSPKR all=m
 INPUT_SPARCSPKR sparc64=m
@@ -1614,10 +1650,12 @@ INPUT_KXTJ9_POLLED_MODE all=y
 INPUT_POWERMATE all=m sparc=n
 INPUT_YEALINK all=m sparc=n
 INPUT_CM109 all=m
+INPUT_RETU_PWRBUTTON all=m
 INPUT_TWL4030_PWRBUTTON powerpc=m
 INPUT_UINPUT all=m sparc=n
 INPUT_PCF50633_PMU all=m
 INPUT_PCF8574 all=m
+INPUT_PWM_BEEPER all=m
 INPUT_GPIO_ROTARY_ENCODER all=m
 INPUT_DA9052_ONKEY all=m
 INPUT_WM831X_ON all=m
@@ -1668,6 +1706,7 @@ SERIO_RAW all=m
 SERIO_XILINX_XPS_PS2 all=m
 SERIO_ALTERA_PS2 all=m
 SERIO_PS2MULT all=m
+SERIO_ARC_PS2 all=m
 
 #-
 #- *** FILE: drivers/input/tablet/Kconfig ***
@@ -1720,6 +1759,7 @@ TOUCHSCREEN_PENMOUNT all=m
 TOUCHSCREEN_EDT_FT5X06 all=m
 TOUCHSCREEN_TOUCHRIGHT all=m
 TOUCHSCREEN_TOUCHWIN all=m
+TOUCHSCREEN_TI_AM335X_TSC all=m
 TOUCHSCREEN_UCB1400 all=m sparc=n
 TOUCHSCREEN_PIXCIR all=m
 TOUCHSCREEN_WM831X all=m
@@ -1764,6 +1804,23 @@ INTEL_IOMMU all=y
 INTEL_IOMMU_DEFAULT_ON all=y
 IRQ_REMAP all=y
 
+#-
+#- *** FILE: drivers/ipack/Kconfig ***
+#-
+IPACK_BUS all=m
+#- file drivers/ipack/carriers/Kconfig goes here
+#- file drivers/ipack/devices/Kconfig goes here
+
+#-
+#- *** FILE: drivers/ipack/carriers/Kconfig ***
+#-
+BOARD_TPCI200 all=m
+
+#-
+#- *** FILE: drivers/ipack/devices/Kconfig ***
+#-
+SERIAL_IPOCTAL all=m
+
 #-
 #- *** FILE: drivers/isdn/Kconfig ***
 #-
@@ -2060,6 +2117,7 @@ VIDEO_SAA7146_VV all=m
 #- *** FILE: drivers/media/common/siano/Kconfig ***
 #-
 SMS_SIANO_MDTV all=m
+SMS_SIANO_RC all=y
 
 #-
 #- *** FILE: drivers/media/dvb-core/Kconfig ***
@@ -2797,6 +2855,7 @@ MSPRO_BLOCK all=m
 MEMSTICK_TIFM_MS all=m
 MEMSTICK_JMICRON_38X all=m
 MEMSTICK_R592 all=m
+MEMSTICK_REALTEK_PCI all=m
 
 #-
 #- *** FILE: drivers/message/fusion/Kconfig ***
@@ -2829,6 +2888,8 @@ I2O_PROC all=m
 #-
 MFD_SM501 all=m
 MFD_SM501_GPIO all=y
+MFD_RTSX_PCI all=m
+MFD_TI_AM335X_TSCADC all=m
 HTC_PASIC3 all=m
 UCB1400_CORE all=m
 MFD_LM3533 all=m
@@ -2874,6 +2935,8 @@ MFD_RDC321X all=m
 MFD_JANZ_CMODIO all=m
 MFD_VX855 all=m
 MFD_WL1273_CORE all=m
+MFD_VIPERBOARD all=m
+MFD_RETU all=m
 
 #-
 #- *** FILE: drivers/misc/Kconfig ***
@@ -2997,6 +3060,7 @@ MMC_CLKGATE all=n
 MMC_SDHCI all=m sparc=n
 MMC_SDHCI_PCI all=m
 MMC_RICOH_MMC all=y
+MMC_SDHCI_ACPI all=m
 MMC_SDHCI_PLTFM all=m
 MMC_WBSD all=m
 MMC_TIFM_SD all=m
@@ -3006,6 +3070,7 @@ MMC_CB710 all=m
 MMC_VIA_SDMMC all=m
 MMC_VUB300 all=m
 MMC_USHC all=m
+MMC_REALTEK_PCI all=m
 
 #-
 #- *** FILE: drivers/mtd/Kconfig ***
@@ -3145,6 +3210,7 @@ MTD_NAND_BCH all=m
 MTD_NAND_ECC_BCH all=y
 MTD_NAND_MUSEUM_IDS all=y sparc=n
 MTD_NAND_DENALI all=m
+MTD_NAND_DENALI_PCI all=m
 MTD_NAND_DENALI_SCRATCH_REG_ADDR all=0xFF108018
 MTD_NAND_IDS all=m
 MTD_NAND_RICOH all=m
@@ -3323,6 +3389,7 @@ CAN_SOFTING_CS all=m
 #-
 CAN_EMS_USB all=m
 CAN_ESD_USB2 all=m
+CAN_KVASER_USB all=m
 CAN_PEAK_USB all=m
 
 #-
@@ -3498,6 +3565,13 @@ NET_VENDOR_BROCADE all=y
 #-
 BNA all=m
 
+#-
+#- *** FILE: drivers/net/ethernet/cadence/Kconfig ***
+#-
+NET_CADENCE all=y
+ARM_AT91_ETHER all=m
+MACB all=m
+
 #-
 #- *** FILE: drivers/net/ethernet/calxeda/Kconfig ***
 #-
@@ -3628,14 +3702,12 @@ E1000 all=m sparc=n
 E1000E all=m
 IGB all=m
 IGB_DCA all=y
-IGB_PTP all=y
 IGBVF all=m
 IXGB all=m sparc=n
 IXGBE all=m
 IXGBE_HWMON all=y
 IXGBE_DCA all=y
 IXGBE_DCB all=y
-IXGBE_PTP all=y
 IXGBEVF all=m
 
 #-
@@ -3643,6 +3715,7 @@ IXGBEVF all=m
 #-
 NET_VENDOR_MARVELL all=y
 MV643XX_ETH ppc=m
+MVMDIO all=m
 SKGE all=m
 SKGE_DEBUG all=n
 SKGE_GENESIS all=y
@@ -3710,7 +3783,6 @@ NET_VENDOR_OKI all=y
 #- *** FILE: drivers/net/ethernet/oki-semi/pch_gbe/Kconfig ***
 #-
 PCH_GBE all=m
-PCH_PTP all=y
 
 #-
 #- *** FILE: drivers/net/ethernet/packetengines/Kconfig ***
@@ -3771,7 +3843,6 @@ SFC all=m sparc=n
 SFC_MTD all=y
 SFC_MCDI_MON all=y
 SFC_SRIOV all=y
-SFC_PTP all=y
 
 #-
 #- *** FILE: drivers/net/ethernet/silan/Kconfig ***
@@ -4029,6 +4100,7 @@ USB_NET_AX8817X all=m
 USB_NET_CDCETHER all=m
 USB_NET_CDC_EEM all=m
 USB_NET_CDC_NCM all=m
+USB_NET_CDC_MBIM all=m
 USB_NET_DM9601 all=m
 USB_NET_SMSC75XX all=m
 USB_NET_SMSC95XX all=m
@@ -4141,11 +4213,19 @@ MWL8K all=m
 #- *** FILE: drivers/net/wireless/ath/Kconfig ***
 #-
 ATH_COMMON all=m
+ATH_CARDS all=m
 ATH_DEBUG all=n
 #- file drivers/net/wireless/ath/ath5k/Kconfig goes here
 #- file drivers/net/wireless/ath/ath9k/Kconfig goes here
 #- file drivers/net/wireless/ath/carl9170/Kconfig goes here
 #- file drivers/net/wireless/ath/ath6kl/Kconfig goes here
+#- file drivers/net/wireless/ath/ar5523/Kconfig goes here
+#- file drivers/net/wireless/ath/wil6210/Kconfig goes here
+
+#-
+#- *** FILE: drivers/net/wireless/ath/ar5523/Kconfig ***
+#-
+AR5523 all=m
 
 #-
 #- *** FILE: drivers/net/wireless/ath/ath5k/Kconfig ***
@@ -4181,6 +4261,12 @@ CARL9170 all=m
 CARL9170_LEDS all=y
 CARL9170_HWRNG all=y
 
+#-
+#- *** FILE: drivers/net/wireless/ath/wil6210/Kconfig ***
+#-
+WIL6210 all=m
+WIL6210_ISR_COR all=y
+
 #-
 #- *** FILE: drivers/net/wireless/b43/Kconfig ***
 #-
@@ -4208,7 +4294,11 @@ B43LEGACY_PIO_MODE all=n
 #-
 BRCMUTIL all=m
 BRCMSMAC all=m
-BRCMFMAC all=n
+BRCMFMAC all=m
+BRCMFMAC_SDIO all=y
+BRCMFMAC_SDIO_OOB all=y
+BRCMFMAC_USB all=y
+BRCM_TRACING all=y
 BRCMDBG all=n
 
 #-
@@ -4250,7 +4340,6 @@ IWLWIFI_DEBUG all=y
 IWLWIFI_DEBUG_EXPERIMENTAL_UCODE all=y
 IWLWIFI_DEVICE_TRACING all=n
 IWLWIFI_P2P all=y
-IWLWIFI_EXPERIMENTAL_MFP all=n
 
 #-
 #- *** FILE: drivers/net/wireless/libertas/Kconfig ***
@@ -4328,6 +4417,7 @@ RTL8187 all=m
 RTL8192CE all=m
 RTL8192SE all=m
 RTL8192DE all=m
+RTL8723AE all=m
 RTL8192CU all=m
 RTLWIFI_DEBUG all=n
 RTL8192C_COMMON all=m
@@ -4592,8 +4682,10 @@ CHARGER_MAX8903 all=m
 CHARGER_LP8727 all=m
 CHARGER_GPIO all=m
 CHARGER_MANAGER all=y
+CHARGER_BQ2415X all=m
 CHARGER_SMB347 all=m
 AB8500_BM all=n
+#- file drivers/power/reset/Kconfig goes here
 #- file drivers/power/avs/Kconfig goes here
 
 #-
@@ -4601,6 +4693,11 @@ AB8500_BM all=n
 #-
 POWER_AVS all=y
 
+#-
+#- *** FILE: drivers/power/reset/Kconfig ***
+#-
+POWER_RESET all=y
+
 #-
 #- *** FILE: drivers/pps/Kconfig ***
 #-
@@ -4621,7 +4718,6 @@ PPS_CLIENT_GPIO all=m
 #-
 #- *** FILE: drivers/ptp/Kconfig ***
 #-
-#- Enable Device Drivers -> PPS to see the PTP clock options.
 PTP_1588_CLOCK all=m
 #- Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 PTP_1588_CLOCK_PCH all=m
@@ -4660,7 +4756,7 @@ RAPIDIO_TSI500 all=y
 #-
 REGULATOR all=y
 REGULATOR_DEBUG all=n
-REGULATOR_DUMMY all=y
+REGULATOR_DUMMY all=n
 REGULATOR_FIXED_VOLTAGE all=m
 REGULATOR_VIRTUAL_CONSUMER all=m
 REGULATOR_USERSPACE_CONSUMER all=m
@@ -4677,12 +4773,14 @@ REGULATOR_MAX1586 all=m
 REGULATOR_MAX8649 all=m
 REGULATOR_MAX8660 all=m
 REGULATOR_MAX8952 all=m
+REGULATOR_MAX8973 all=m
 REGULATOR_PCAP all=m
 REGULATOR_LP3971 all=m
 REGULATOR_LP3972 all=m
 REGULATOR_PCF50633 all=m
 REGULATOR_AB3100 all=m
 REGULATOR_AB8500 all=y
+REGULATOR_TPS51632 all=m
 REGULATOR_TPS6105X all=m
 REGULATOR_TPS62360 all=m
 REGULATOR_TPS65023 all=m
@@ -4726,6 +4824,7 @@ RTC_DRV_RS5C372 all=m
 RTC_DRV_ISL1208 all=m
 RTC_DRV_ISL12022 all=m
 RTC_DRV_X1205 all=m
+RTC_DRV_PCF8523 all=m
 RTC_DRV_PCF8563 all=m
 RTC_DRV_PCF8583 all=m sparc=n
 RTC_DRV_M41T80 all=m
@@ -4845,6 +4944,7 @@ SCSI_IN2000 alpha=m i386=m
 SCSI_ARCMSR all=m sparc=n
 #- file drivers/scsi/megaraid/Kconfig.megaraid goes here
 #- file drivers/scsi/mpt2sas/Kconfig goes here
+#- file drivers/scsi/mpt3sas/Kconfig goes here
 #- file drivers/scsi/ufs/Kconfig goes here
 SCSI_HPTIOP all=m sparc=n
 SCSI_BUSLOGIC all=m
@@ -4923,6 +5023,7 @@ SCSI_PM8001 all=m
 SCSI_SRP all=m sparc=n
 SCSI_BFA_FC all=m
 SCSI_VIRTIO all=m
+#- file drivers/scsi/csiostor/Kconfig goes here
 #- file drivers/scsi/pcmcia/Kconfig goes here
 #- file drivers/scsi/device_handler/Kconfig goes here
 #- file drivers/scsi/osd/Kconfig goes here
@@ -4968,6 +5069,11 @@ SCSI_BNX2X_FCOE all=m
 #-
 SCSI_BNX2_ISCSI all=m
 
+#-
+#- *** FILE: drivers/scsi/csiostor/Kconfig ***
+#-
+SCSI_CHELSIO_FCOE all=m
+
 #-
 #- *** FILE: drivers/scsi/cxgbi/cxgb3i/Kconfig ***
 #-
@@ -5010,6 +5116,13 @@ SCSI_MPT2SAS all=m
 SCSI_MPT2SAS_MAX_SGE all=128
 SCSI_MPT2SAS_LOGGING all=y
 
+#-
+#- *** FILE: drivers/scsi/mpt3sas/Kconfig ***
+#-
+SCSI_MPT3SAS all=m
+SCSI_MPT3SAS_MAX_SGE all=128
+SCSI_MPT3SAS_LOGGING all=y
+
 #-
 #- *** FILE: drivers/scsi/mvsas/Kconfig ***
 #-
@@ -5095,6 +5208,7 @@ SSB_PCMCIAHOST all=y
 SSB_SDIOHOST sparc=y
 SSB_SILENT all=n
 SSB_DEBUG all=n
+SSB_DRIVER_GPIO all=y
 
 #-
 #- *** FILE: drivers/staging/Kconfig ***
@@ -5114,7 +5228,6 @@ STAGING all=y
 #- file drivers/staging/rtl8192u/Kconfig goes here
 #- file drivers/staging/rtl8192e/Kconfig goes here
 #- file drivers/staging/rtl8712/Kconfig goes here
-#- file drivers/staging/rts_pstor/Kconfig goes here
 #- file drivers/staging/rts5139/Kconfig goes here
 #- file drivers/staging/frontier/Kconfig goes here
 #- file drivers/staging/phison/Kconfig goes here
@@ -5148,10 +5261,8 @@ STAGING all=y
 #- file drivers/staging/net/Kconfig goes here
 #- file drivers/staging/omapdrm/Kconfig goes here
 #- file drivers/staging/android/Kconfig goes here
-#- file drivers/staging/telephony/Kconfig goes here
 #- file drivers/staging/ozwpan/Kconfig goes here
 #- file drivers/staging/ccg/Kconfig goes here
-#- file drivers/staging/ipack/Kconfig goes here
 #- file drivers/staging/gdm72xx/Kconfig goes here
 #- file drivers/staging/csr/Kconfig goes here
 #- file drivers/staging/omap-thermal/Kconfig goes here
@@ -5160,6 +5271,8 @@ STAGING all=y
 #- file drivers/staging/ced1401/Kconfig goes here
 #- file drivers/staging/imx-drm/Kconfig goes here
 #- file drivers/staging/dgrp/Kconfig goes here
+#- file drivers/staging/sb105x/Kconfig goes here
+#- file drivers/staging/fwserial/Kconfig goes here
 
 #-
 #- *** FILE: drivers/staging/android/Kconfig ***
@@ -5195,7 +5308,6 @@ COMEDI_TEST all=m
 COMEDI_PARPORT all=m
 COMEDI_SERIAL2002 all=m
 COMEDI_SKEL all=m
-COMEDI_ISA_DRIVERS all=m
 COMEDI_ACL7225B i386=m
 COMEDI_PCL711 i386=m
 COMEDI_PCL724 i386=m
@@ -5245,10 +5357,8 @@ COMEDI_ADDI_APCI_1500 all=m
 COMEDI_ADDI_APCI_1516 all=m
 COMEDI_ADDI_APCI_1564 all=m
 COMEDI_ADDI_APCI_16XX all=m
-COMEDI_ADDI_APCI_2016 all=m
 COMEDI_ADDI_APCI_2032 all=m
 COMEDI_ADDI_APCI_2200 all=m
-COMEDI_ADDI_APCI_3001 all=m
 COMEDI_ADDI_APCI_3120 all=m
 COMEDI_ADDI_APCI_3501 all=m
 COMEDI_ADDI_APCI_3XXX all=m
@@ -5361,6 +5471,11 @@ FT1000 all=m
 FT1000_USB all=m
 FT1000_PCMCIA all=m
 
+#-
+#- *** FILE: drivers/staging/fwserial/Kconfig ***
+#-
+FIREWIRE_SERIAL all=m
+
 #-
 #- *** FILE: drivers/staging/gdm72xx/Kconfig ***
 #-
@@ -5413,21 +5528,15 @@ SCA3000 all=m
 #- *** FILE: drivers/staging/iio/adc/Kconfig ***
 #-
 AD7291 all=m
-AD7298 all=m
 AD7606 all=m
 AD7606_IFACE_PARALLEL all=m
 AD7606_IFACE_SPI all=m
 AD799X all=m
-AD7887 all=m
 AD7780 all=m
-AD7793 all=m
 AD7816 all=m
 AD7192 all=m
-ADT7310 all=m
 ADT7410 all=m
 AD7280 all=m
-MAX1363 all=m
-MAX1363_RING_BUFFER all=y
 
 #-
 #- *** FILE: drivers/staging/iio/addac/Kconfig ***
@@ -5514,23 +5623,6 @@ IIO_PERIODIC_RTC_TRIGGER all=m
 IIO_GPIO_TRIGGER all=m
 IIO_SYSFS_TRIGGER all=m
 
-#-
-#- *** FILE: drivers/staging/ipack/Kconfig ***
-#-
-IPACK_BUS all=m
-#- file drivers/staging/ipack/bridges/Kconfig goes here
-#- file drivers/staging/ipack/devices/Kconfig goes here
-
-#-
-#- *** FILE: drivers/staging/ipack/bridges/Kconfig ***
-#-
-BOARD_TPCI200 all=m
-
-#-
-#- *** FILE: drivers/staging/ipack/devices/Kconfig ***
-#-
-SERIAL_IPOCTAL all=m
-
 #-
 #- *** FILE: drivers/staging/keucr/Kconfig ***
 #-
@@ -5540,11 +5632,7 @@ USB_ENESTORAGE all=m
 #- *** FILE: drivers/staging/line6/Kconfig ***
 #-
 LINE6_USB all=m
-LINE6_USB_DEBUG all=n
-LINE6_USB_DUMP_CTRL all=n
-LINE6_USB_DUMP_MIDI all=n
 LINE6_USB_DUMP_PCM all=n
-LINE6_USB_RAW all=n
 LINE6_USB_IMPULSE_RESPONSE all=n
 
 #-
@@ -5680,10 +5768,9 @@ RTS5139 all=m
 RTS5139_DEBUG all=n
 
 #-
-#- *** FILE: drivers/staging/rts_pstor/Kconfig ***
+#- *** FILE: drivers/staging/sb105x/Kconfig ***
 #-
-RTS_PSTOR all=m
-RTS_PSTOR_DEBUG all=n
+SB105X all=m
 
 #-
 #- *** FILE: drivers/staging/sbe-2t3e3/Kconfig ***
@@ -5742,13 +5829,6 @@ SPEAKUP_SYNTH_DUMMY all=m
 #-
 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 all=m
 
-#-
-#- *** FILE: drivers/staging/telephony/Kconfig ***
-#-
-PHONE all=m
-PHONE_IXJ all=m
-PHONE_IXJ_PCMCIA all=m
-
 #-
 #- *** FILE: drivers/staging/usbip/Kconfig ***
 #-
@@ -5851,6 +5931,11 @@ TCM_FC all=m
 #- *** FILE: drivers/thermal/Kconfig ***
 #-
 THERMAL all=y
+THERMAL_DEFAULT_GOV_STEP_WISE all=y
+THERMAL_DEFAULT_GOV_FAIR_SHARE all=n
+THERMAL_DEFAULT_GOV_USER_SPACE all=n
+FAIR_SHARE all=y
+USER_SPACE all=y
 CPU_THERMAL all=y
 
 #-
@@ -5958,6 +6043,8 @@ SERIAL_ALTERA_UART_BAUDRATE all=115200
 SERIAL_IFX6X60 all=m
 SERIAL_PCH_UART all=m
 SERIAL_XILINX_PS_UART all=m
+SERIAL_ARC all=m
+SERIAL_ARC_NR_PORTS all=1
 
 #-
 #- *** FILE: drivers/uio/Kconfig ***
@@ -5966,6 +6053,7 @@ UIO all=m
 UIO_CIF all=m
 UIO_PDRV all=m
 UIO_PDRV_GENIRQ all=m
+UIO_DMEM_GENIRQ all=m
 UIO_AEC all=m
 UIO_SERCOS3 all=m
 UIO_PCI_GENERIC all=m
@@ -6077,8 +6165,6 @@ USB_FUNCTIONFS all=m
 USB_FUNCTIONFS_ETH all=y
 USB_FUNCTIONFS_RNDIS all=y
 USB_FUNCTIONFS_GENERIC all=y
-USB_FILE_STORAGE all=m
-USB_FILE_STORAGE_TEST all=n
 USB_MASS_STORAGE all=m
 USB_GADGET_TARGET all=m
 USB_G_SERIAL all=m
@@ -6115,7 +6201,6 @@ USB_ISP116X_HCD all=m
 USB_ISP1760_HCD all=m
 USB_ISP1362_HCD all=m
 USB_OHCI_HCD all=m
-USB_OHCI_HCD_PPC_SOC ppc=y
 USB_OHCI_HCD_PPC_OF_BE ppc=y ppc64=y
 USB_OHCI_HCD_PPC_OF_LE ppc=y ppc64=n
 USB_OHCI_HCD_PPC_OF ppc=y ppc64=y
@@ -6202,6 +6287,7 @@ USB_MV_OTG all=m
 #- USB Physical Layer drivers
 OMAP_USB2 all=m
 USB_ISP1301 all=m
+USB_RCAR_PHY all=m
 
 #-
 #- *** FILE: drivers/usb/renesas_usbhs/Kconfig ***
@@ -6345,7 +6431,6 @@ TCM_VHOST all=m
 #- file drivers/char/agp/Kconfig goes here
 #- file drivers/gpu/vga/Kconfig goes here
 #- file drivers/gpu/drm/Kconfig goes here
-#- file drivers/gpu/misc/Kconfig goes here
 #- file drivers/gpu/stub/Kconfig goes here
 VGASTATE all=m
 VIDEO_OUTPUT_CONTROL all=m
@@ -6743,8 +6828,6 @@ FILE_LOCKING all=y
 #- file fs/quota/Kconfig goes here
 #- file fs/autofs4/Kconfig goes here
 #- file fs/fuse/Kconfig goes here
-#- file fs/overlayfs/Kconfig goes here
-CUSE all=m
 GENERIC_ACL all=y
 #- file fs/fscache/Kconfig goes here
 #- file fs/cachefiles/Kconfig goes here
@@ -6784,7 +6867,7 @@ MISC_FILESYSTEMS all=y
 #- file fs/sysv/Kconfig goes here
 #- file fs/ufs/Kconfig goes here
 #- file fs/exofs/Kconfig goes here
-#- file fs/aufs/Kconfig goes here
+#- file fs/f2fs/Kconfig goes here
 #- file fs/exofs/Kconfig.ore goes here
 NETWORK_FILESYSTEMS all=y
 #- file fs/nfs/Kconfig goes here
@@ -6831,11 +6914,6 @@ AFS_FS all=m
 AFS_DEBUG all=n
 AFS_FSCACHE all=y
 
-#-
-#- *** FILE: fs/aufs/Kconfig ***
-#-
-AUFS_PROC_MAP all=n
-
 #-
 #- *** FILE: fs/autofs4/Kconfig ***
 #-
@@ -6881,6 +6959,7 @@ CIFS_UPCALL all=y
 CIFS_XATTR all=y
 CIFS_POSIX all=y
 CIFS_ACL all=y
+CIFS_DEBUG all=y
 CIFS_DEBUG2 all=n
 CIFS_DFS_UPCALL all=n
 CIFS_SMB2 all=y
@@ -6945,11 +7024,18 @@ EXT3_FS_SECURITY all=y
 #- *** FILE: fs/ext4/Kconfig ***
 #-
 EXT4_FS all=m
-EXT4_FS_XATTR all=y
 EXT4_FS_POSIX_ACL all=y
 EXT4_FS_SECURITY all=y
 EXT4_DEBUG all=n
 
+#-
+#- *** FILE: fs/f2fs/Kconfig ***
+#-
+F2FS_FS all=m
+F2FS_STAT_FS all=y
+F2FS_FS_XATTR all=y
+F2FS_FS_POSIX_ACL all=y
+
 #-
 #- *** FILE: fs/fat/Kconfig ***
 #-
@@ -6977,6 +7063,7 @@ FSCACHE_OBJECT_LIST all=n
 #- *** FILE: fs/fuse/Kconfig ***
 #-
 FUSE_FS all=m
+CUSE all=m
 
 #-
 #- *** FILE: fs/gfs2/Kconfig ***
@@ -7337,9 +7424,12 @@ RCU_FANOUT all=32 alpha=64 ia64=64 ppc64=64 sparc64=64 x86_64=64
 RCU_FANOUT_LEAF all=16
 RCU_FANOUT_EXACT all=n
 RCU_FAST_NO_HZ all=y
+RCU_NOCB_CPU all=y
 IKCONFIG all=m
 IKCONFIG_PROC all=y
 LOG_BUF_SHIFT all=18
+NUMA_BALANCING_DEFAULT_ENABLED all=y
+NUMA_BALANCING all=y
 CGROUPS all=y
 CGROUP_DEBUG all=n
 CGROUP_FREEZER all=y
@@ -7659,9 +7749,11 @@ FLATMEM_MANUAL all=n alpha=y ppc=y sparc=y sparc64=n
 DISCONTIGMEM_MANUAL all=n
 SPARSEMEM_MANUAL all=y alpha=n ppc=n sparc=n sparc64=y
 SPARSEMEM_VMEMMAP all=y
+MOVABLE_NODE all=y
 MEMORY_HOTPLUG all=y
 MEMORY_HOTREMOVE all=y
 SPLIT_PTLOCK_CPUS all=4
+BALLOON_COMPACTION all=y
 COMPACTION all=y
 MIGRATION all=y
 ZONE_DMA_FLAG all=1 sparc64=0
@@ -7795,6 +7887,7 @@ ROSE all=m
 #-
 BATMAN_ADV all=m
 BATMAN_ADV_BLA all=y
+BATMAN_ADV_DAT all=y
 BATMAN_ADV_DEBUG all=n
 
 #-
@@ -8208,6 +8301,7 @@ NETFILTER_XT_TARGET_LOG all=m
 NETFILTER_XT_TARGET_MARK all=m
 NETFILTER_XT_TARGET_NFLOG all=m
 NETFILTER_XT_TARGET_NFQUEUE all=m
+NETFILTER_XT_TARGET_NOTRACK all=m
 NETFILTER_XT_TARGET_RATEEST all=m
 NETFILTER_XT_TARGET_TEE all=m
 NETFILTER_XT_TARGET_TPROXY all=m
@@ -8444,9 +8538,10 @@ IP_SCTP all=m
 NET_SCTPPROBE all=m
 SCTP_DBG_MSG all=n
 SCTP_DBG_OBJCNT all=n
-SCTP_HMAC_NONE all=n
-SCTP_HMAC_SHA1 all=n
-SCTP_HMAC_MD5 all=y
+SCTP_DEFAULT_COOKIE_HMAC_MD5 all=y
+SCTP_DEFAULT_COOKIE_HMAC_SHA1 all=n
+SCTP_DEFAULT_COOKIE_HMAC_NONE all=n
+SCTP_COOKIE_HMAC_SHA1 all=y
 
 #-
 #- *** FILE: net/sunrpc/Kconfig ***
@@ -8455,13 +8550,13 @@ SUNRPC all=m
 SUNRPC_GSS all=m
 SUNRPC_XPRT_RDMA all=m
 RPCSEC_GSS_KRB5 all=m
-SUNRPC_DEBUG all=n
+SUNRPC_DEBUG all=y
 
 #-
 #- *** FILE: net/tipc/Kconfig ***
 #-
 TIPC all=m
-TIPC_ADVANCED all=n
+TIPC_PORTS all=8191
 
 #-
 #- *** FILE: net/unix/Kconfig ***
@@ -8546,7 +8641,6 @@ DEFAULT_SECURITY all=""
 #-
 SECURITY_APPARMOR=y
 SECURITY_APPARMOR_BOOTPARAM_VALUE=1
-SECURITY_APPARMOR_COMPAT_24=y
 
 #-
 #- *** FILE: security/integrity/ima/Kconfig ***
@@ -8682,7 +8776,7 @@ SND_OPL4_LIB alpha=m i386=m
 SND_VX_LIB all=m
 SND_AC97_CODEC all=m
 SND_DRIVERS all=n
-SND_PCSP all=n
+SND_PCSP all=y
 SND_DUMMY all=m
 SND_VIRMIDI all=m
 SND_MTPAV all=m
@@ -8700,6 +8794,7 @@ SND_FIREWIRE all=y
 SND_FIREWIRE_LIB all=m
 SND_FIREWIRE_SPEAKERS all=m
 SND_ISIGHT all=m
+SND_SCS1X all=m
 
 #-
 #- *** FILE: sound/isa/Kconfig ***
@@ -8998,8 +9093,10 @@ AD2S1210_GPIO_NONE all=y
 AD2S1210_GPIO_OUTPUT all=n
 AD7314 all=m
 AD7745 all=m
+ADT7310 all=m
 ADT75 all=m
 ATH6K_LEGACY all=n
+AUFS_PROC_MAP all=n
 BACKLIGHT_PROGEAR i386=m x86_64=m
 BATTERY_BQ20Z75 all=m
 BLK_DEV_UB all=n
@@ -9010,6 +9107,8 @@ CGROUP_MEM_RES_CTLR all=y
 CGROUP_MEM_RES_CTLR_KMEM all=y
 CGROUP_MEM_RES_CTLR_SWAP all=y
 CGROUP_MEM_RES_CTLR_SWAP_ENABLED all=n
+COMEDI_ADDI_APCI_2016 all=m
+COMEDI_ADDI_APCI_3001 all=m
 COMEDI_ADL_PCI7230 all=m
 COMEDI_ADL_PCI7296 all=m
 COMEDI_ADL_PCI7432 all=m
@@ -9040,6 +9139,7 @@ ECONET_NATIVE all=y
 ELMC i386=m
 ELMC_II i386=m
 ET131X_DEBUG all=n
+EXT4_FS_XATTR all=y
 GPIO_BASIC_MMIO all=m
 GPIO_BASIC_MMIO_CORE all=m
 HID_QUANTA all=m
@@ -9070,6 +9170,7 @@ IBM_NEW_EMAC_RXB ppc64=128
 IBM_NEW_EMAC_RX_COPY_THRESHOLD ppc64=256
 IBM_NEW_EMAC_RX_SKB_HEADROOM ppc64=0
 IBM_NEW_EMAC_TXB ppc64=64
+IGB_PTP all=y
 IIO_RING_BUFFER all=y
 INPUT_ATI_REMOTE all=m sparc=n
 IP6_NF_QUEUE all=m
@@ -9079,6 +9180,7 @@ ISERIES_VETH ppc64=n
 ISTALLION all=m
 IWLAGN all=m
 IWLWIFI_DEVICE_SVTOOL all=y
+IWLWIFI_EXPERIMENTAL_MFP all=n
 IWLWIFI_LEGACY all=m
 IWLWIFI_LEGACY_DEBUG all=n
 IWLWIFI_LEGACY_DEVICE_TRACING all=n
@@ -9089,15 +9191,21 @@ IWMC3200TOP_DEBUG all=n
 IWMC3200TOP_DEBUGFS all=n
 IWM_DEBUG all=n
 IWM_TRACING all=n
+IXGBE_PTP all=y
 LEDS_ALIX2 all=m
 LEDS_GPIO_OF powerpc=y sparc=y
 LEDS_GPIO_PLATFORM all=y
 LEDS_LM3556 all=m
 LEDS_NET5501 all=m
+LINE6_USB_DEBUG all=n
+LINE6_USB_DUMP_CTRL all=n
+LINE6_USB_DUMP_MIDI all=n
+LINE6_USB_RAW all=n
 LIRC_TTUSBIR all=m
 LOGIWII_FF all=y
 LOOPBACK_TARGET_CDB_DEBUG all=n
 MADGEMC all=m
+MAX1363_RING_BUFFER all=y
 MCA_LEGACY i386=y
 MCA_PROC_FS i386=y
 MEDIA_TUNER_CUSTOMISE all=n
@@ -9112,7 +9220,6 @@ MYRI_SBUS sparc=m sparc64=m
 NE2_MCA i386=m
 NETDEV_1000 all=y
 NETDEV_10000 all=y
-NETFILTER_XT_TARGET_NOTRACK all=m
 NET_ETHERNET all=y
 NET_ISA alpha=y i386=y
 NET_PCI all=y
@@ -9123,8 +9230,12 @@ NFC_DEVICES all=y
 NFSD_DEPRECATED all=n
 NFS_USE_NEW_IDMAPPER all=y
 NF_CONNTRACK_RTSP all=m
+PCH_PTP all=y
 PCMCIA_IBMTR all=m ppc=n
 PERF_COUNTERS all=y
+PHONE all=m
+PHONE_IXJ all=m
+PHONE_IXJ_PCMCIA all=m
 PN544_NFC all=m
 POHMELFS all=m
 POHMELFS_CRYPTO all=y
@@ -9137,13 +9248,20 @@ REGULATOR_BQ24022 all=m
 RIO all=m
 RIO_OLDPCI all=n ia64=y ppc=y ppc64=y
 RISCOM8 all=m
+RTS_PSTOR all=m
+RTS_PSTOR_DEBUG all=n
 SCSI_ARCMSR_AER all=y
 SCSI_FD_MCS i386=m
 SCSI_IBMMCA i386=m
 SCSI_WAIT_SCAN all=m
+SCTP_HMAC_MD5 all=y
+SCTP_HMAC_NONE all=n
+SCTP_HMAC_SHA1 all=n
+SECURITY_APPARMOR_COMPAT_24=y
 SERIAL_8250_MCA i386=m
 SERIAL_MAX3107 all=m
 SERIAL_MAX3107_AAVA all=m
+SFC_PTP all=y
 SIGMA all=m
 SKISA alpha=m i386=m
 SMCTR all=m
@@ -9163,6 +9281,7 @@ STALLION all=m
 STMMAC_DUAL_MAC all=y
 SX all=m
 SYSCTL_SYSCALL_CHECK all=n
+TIPC_ADVANCED all=n
 TIPC_DEBUG all=n
 TMS380TR all=m sparc=
 TMSPCI all=m sparc=
@@ -9175,6 +9294,8 @@ USB_DEVICEFS all=y
 USB_DEVICE_CLASS all=n
 USB_ET61X251 all=m
 USB_EZUSB all=y
+USB_FILE_STORAGE all=m
+USB_FILE_STORAGE_TEST all=n
 USB_GADGET_AMD5536UDC all=n
 USB_GADGET_AT91 all=n
 USB_GADGET_ATMEL_USBA all=n
@@ -9196,6 +9317,7 @@ USB_GADGET_S3C2410 all=n
 USB_GADGET_SELECTED all=y
 USB_LANGWELL_OTG all=m
 USB_LIBUSUAL all=y
+USB_OHCI_HCD_PPC_SOC ppc=y
 USB_SERIAL_QUATECH_USB2 all=m
 V4L_ISA_PARPORT_DRIVERS all=y
 V4L_PCI_DRIVERS all=y
@@ -9215,4 +9337,4 @@ WL12XX_SDIO_TEST all=m
 WL12XX_SPI all=m
 WM5102 all=y
 XEN_PLATFORM_PCI all=m
-XVMALLOC all=y
+XVMALLOC all=y