- up for 3.4

Changed files:
    kernel-multiarch.config -> 1.89

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 4560be5ba20a19ff1d240e8a705596def0a7b9f6..a0022c7df91679d5edddd3bfafd8cb0ff6d442f1 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -137,6 +137,7 @@ CRYPTO_ARC4 all=m
 CRYPTO_BLOWFISH all=m
 CRYPTO_BLOWFISH_X86_64 all=m
 CRYPTO_CAMELLIA all=m
+CRYPTO_CAMELLIA_X86_64 all=m
 CRYPTO_CAST5 all=m
 CRYPTO_CAST6 all=m
 CRYPTO_DES all=m
@@ -202,6 +203,7 @@ ACPI_HOTPLUG_MEMORY all=m
 ACPI_SBS x86=m
 ACPI_HED all=m
 ACPI_CUSTOM_METHOD all=m
+ACPI_BGRT all=m
 #- file drivers/acpi/apei/Kconfig goes here
 
 #-
@@ -487,7 +489,6 @@ SGI_TIOCX ia64=y
 SGI_MBCS ia64=m
 #- file drivers/tty/serial/Kconfig goes here
 TTY_PRINTK all=y
-BRIQ_PANEL ppc=m
 PRINTER all=m
 LP_CONSOLE all=n
 PPDEV all=m
@@ -776,10 +777,12 @@ GPIO_JANZ_TTL all=m
 #- *** FILE: drivers/gpu/drm/Kconfig ***
 #-
 DRM all=m
+DRM_LOAD_EDID_FIRMWARE all=y
 DRM_TDFX all=m
 DRM_R128 all=m
 DRM_RADEON all=m
 #- file drivers/gpu/drm/radeon/Kconfig goes here
+#- file drivers/gpu/drm/nouveau/Kconfig goes here
 DRM_I810 i386=m x86_64=m
 DRM_I915 i386=m x86_64=m
 DRM_I915_KMS all=y
@@ -790,6 +793,7 @@ DRM_SAVAGE all=m
 #- file drivers/gpu/drm/exynos/Kconfig goes here
 #- file drivers/gpu/drm/vmwgfx/Kconfig goes here
 #- file drivers/gpu/drm/gma500/Kconfig goes here
+#- file drivers/gpu/drm/udl/Kconfig goes here
 
 #-
 #- *** FILE: drivers/gpu/drm/gma500/Kconfig ***
@@ -812,6 +816,11 @@ DRM_I2C_SIL164 all=m
 #-
 DRM_RADEON_KMS all=y
 
+#-
+#- *** FILE: drivers/gpu/drm/udl/Kconfig ***
+#-
+DRM_UDL all=m
+
 #-
 #- *** FILE: drivers/gpu/drm/vmwgfx/Kconfig ***
 #-
@@ -882,13 +891,7 @@ HID_PICOLCD_LCD all=y
 HID_PICOLCD_LEDS all=y
 HID_PRIMAX all=m
 HID_ROCCAT all=m
-HID_ROCCAT_COMMON all=m
-HID_ROCCAT_ARVO all=m
-HID_ROCCAT_ISKU all=m
-HID_ROCCAT_KONE all=m
-HID_ROCCAT_KONEPLUS all=m
-HID_ROCCAT_KOVAPLUS all=m
-HID_ROCCAT_PYRA all=m
+HID_SAITEK all=m
 HID_SAMSUNG all=m
 HID_SONY all=m
 HID_SPEEDLINK all=m
@@ -898,6 +901,7 @@ GREENASIA_FF all=y
 HID_HYPERV_MOUSE all=m
 HID_SMARTJOYPLUS all=m
 SMARTJOYPLUS_FF all=y
+HID_TIVO all=m
 HID_TOPSEED all=m
 HID_THRUSTMASTER all=m
 THRUSTMASTER_FF all=y
@@ -920,6 +924,18 @@ USB_HIDDEV all=y
 USB_KBD all=n
 USB_MOUSE all=n
 
+#-
+#- *** FILE: drivers/hsi/Kconfig ***
+#-
+HSI all=m
+#- file drivers/hsi/clients/Kconfig goes here
+
+#-
+#- *** FILE: drivers/hsi/clients/Kconfig ***
+#-
+#- HSI clients
+HSI_CHAR all=m
+
 #-
 #- *** FILE: drivers/hv/Kconfig ***
 #-
@@ -998,6 +1014,7 @@ SENSORS_MAX1668 all=m
 SENSORS_MAX6639 all=m
 SENSORS_MAX6642 all=m
 SENSORS_MAX6650 all=m
+SENSORS_MCP3021 all=m
 SENSORS_NTC_THERMISTOR all=m
 SENSORS_PC87360 all=m
 SENSORS_PC87427 all=m
@@ -1113,6 +1130,7 @@ I2C_HYDRA ppc=m
 I2C_POWERMAC ppc=m ppc64=m
 #- I2C system bus drivers (mostly embedded / system-on-chip)
 I2C_DESIGNWARE_PCI all=m
+I2C_EG20T all=m
 I2C_GPIO all=m
 I2C_INTEL_MID all=m
 I2C_MPC ppc=n
@@ -1122,7 +1140,6 @@ I2C_PCA_PLATFORM all=m
 I2C_PXA_PCI all=n
 I2C_SIMTEC all=m sparc=n
 I2C_XILINX all=m
-I2C_EG20T all=m
 #- External I2C/SMBus adapter drivers
 I2C_DIOLAN_U2C all=m
 I2C_PARPORT all=m
@@ -1417,6 +1434,7 @@ KEYBOARD_OPENCORES all=m
 KEYBOARD_STOWAWAY all=m
 KEYBOARD_SUNKBD all=m sparc=y sparc64=y
 KEYBOARD_STMPE all=m
+KEYBOARD_OMAP4 all=m
 KEYBOARD_TWL4030 powerpc=m
 KEYBOARD_XTKBD all=m
 
@@ -1451,6 +1469,7 @@ INPUT_UINPUT all=m sparc=n
 INPUT_PCF50633_PMU all=m
 INPUT_PCF8574 all=m
 INPUT_GPIO_ROTARY_ENCODER all=m
+INPUT_DA9052_ONKEY all=m
 INPUT_WM831X_ON all=m
 INPUT_PCAP all=m
 INPUT_ADXL34X all=m
@@ -1483,6 +1502,7 @@ MOUSE_PC110PAD alpha=m i386=m
 MOUSE_VSXXXAA all=m
 MOUSE_GPIO all=m
 MOUSE_SYNAPTICS_I2C all=m
+MOUSE_SYNAPTICS_USB all=m
 
 #-
 #- *** FILE: drivers/input/serio/Kconfig ***
@@ -1523,12 +1543,16 @@ TOUCHSCREEN_ATMEL_MXT all=m
 TOUCHSCREEN_AUO_PIXCIR all=m
 TOUCHSCREEN_BU21013 all=m
 TOUCHSCREEN_CY8CTMG110 all=m
+TOUCHSCREEN_CYTTSP_CORE all=m
+TOUCHSCREEN_CYTTSP_I2C all=m
+TOUCHSCREEN_CYTTSP_SPI all=m
 TOUCHSCREEN_DA9034 all=m
 TOUCHSCREEN_DYNAPRO all=m
 TOUCHSCREEN_HAMPSHIRE all=m
 TOUCHSCREEN_EETI all=m
 TOUCHSCREEN_EGALAX all=m
 TOUCHSCREEN_FUJITSU all=m
+TOUCHSCREEN_ILI210X all=m
 TOUCHSCREEN_GUNZE all=m
 TOUCHSCREEN_ELO all=m
 TOUCHSCREEN_WACOM_W8001 all=m
@@ -1727,7 +1751,6 @@ LEDS_CLASS all=y
 #- LED drivers
 LEDS_LM3530 all=m
 LEDS_NET48XX i386=m
-LEDS_NET5501 all=m
 LEDS_WRAP i386=m
 LEDS_SUNFIRE sparc64=m
 LEDS_PCA9532 all=m
@@ -1738,6 +1761,7 @@ LEDS_LP5521 all=m
 LEDS_LP5523 all=m
 LEDS_CLEVO_MAIL all=m
 LEDS_PCA955X all=m
+LEDS_PCA9633 all=m
 LEDS_WM831X_STATUS all=m
 LEDS_WM8350 all=m
 LEDS_DA903X all=m
@@ -1829,6 +1853,7 @@ DM_MULTIPATH_ST all=m
 DM_DELAY all=m
 DM_UEVENT all=y
 DM_FLAKEY all=m
+DM_VERITY all=m
 
 #-
 #- *** FILE: drivers/media/Kconfig ***
@@ -1953,11 +1978,13 @@ DVB_USB_AF9015 all=m
 DVB_USB_CE6230 all=m
 DVB_USB_FRIIO all=m
 DVB_USB_EC168 all=m
+DVB_USB_AZ6007 all=m
 DVB_USB_AZ6027 all=m
 DVB_USB_LME2510 all=m
 DVB_USB_TECHNISAT_USB2 all=m
 DVB_USB_IT913X all=m
 DVB_USB_MXL111SF all=m
+DVB_USB_RTL28XXU all=m
 
 #-
 #- *** FILE: drivers/media/dvb/firewire/Kconfig ***
@@ -2086,6 +2113,7 @@ USB_DSBR all=m
 RADIO_MAXIRADIO all=m
 I2C_SI4713 all=m
 RADIO_SI4713 all=m
+USB_KEENE all=m
 RADIO_TEA5764 all=m
 RADIO_SAA7706H all=m
 RADIO_TEF6862 all=m
@@ -2141,6 +2169,7 @@ IR_REDRAT3 all=m
 IR_STREAMZAP all=m
 IR_WINBOND_CIR all=m
 RC_LOOPBACK all=m
+IR_GPIO_CIR all=m
 
 #-
 #- *** FILE: drivers/media/rc/keymaps/Kconfig ***
@@ -2244,6 +2273,7 @@ V4L_PLATFORM_DRIVERS all=y
 VIDEO_VIA_CAMERA all=m
 #- file drivers/media/video/davinci/Kconfig goes here
 #- file drivers/media/video/omap/Kconfig goes here
+#- file drivers/media/video/blackfin/Kconfig goes here
 VIDEO_TIMBERDALE all=m
 SOC_CAMERA all=m
 SOC_CAMERA_IMX074 all=m
@@ -2549,6 +2579,7 @@ UCB1400_CORE all=m
 TPS6105X all=m
 TPS65010 all=m
 TPS6507X all=m
+MFD_TPS65217 all=m
 MFD_TPS6586X all=m
 MFD_TPS65912_SPI all=y
 TWL4030_CORE powerpc=y
@@ -2859,6 +2890,7 @@ MTD_NAND_DISKONCHIP all=m
 MTD_NAND_DISKONCHIP_PROBE_ADVANCED all=n
 MTD_NAND_DISKONCHIP_PROBE_ADDRESS all=0
 MTD_NAND_DISKONCHIP_BBTWRITE all=y
+MTD_NAND_DOCG4 all=m
 MTD_NAND_CAFE all=m ppc=n ppc64=n sparc=n
 MTD_NAND_CS553X i386=m
 MTD_NAND_PASEMI ppc64=m
@@ -3010,7 +3042,9 @@ CAN_SJA1000_PLATFORM all=m
 CAN_SJA1000_OF_PLATFORM powerpc=m
 CAN_EMS_PCMCIA all=m
 CAN_EMS_PCI all=m
+CAN_PEAK_PCMCIA all=m
 CAN_PEAK_PCI all=m
+CAN_PEAK_PCIEC all=y
 CAN_KVASER_PCI all=m
 CAN_PLX_PCI all=m
 CAN_TSCAN1 all=m
@@ -3026,6 +3060,7 @@ CAN_SOFTING_CS all=m
 #-
 CAN_EMS_USB all=m
 CAN_ESD_USB2 all=m
+CAN_PEAK_USB all=m
 
 #-
 #- *** FILE: drivers/net/dsa/Kconfig ***
@@ -3112,6 +3147,7 @@ FEALNX all=m
 #- file drivers/net/ethernet/8390/Kconfig goes here
 #- file drivers/net/ethernet/nuvoton/Kconfig goes here
 #- file drivers/net/ethernet/nvidia/Kconfig goes here
+#- file drivers/net/ethernet/nxp/Kconfig goes here
 #- file drivers/net/ethernet/octeon/Kconfig goes here
 #- file drivers/net/ethernet/oki-semi/Kconfig goes here
 ETHOC all=m
@@ -3316,7 +3352,6 @@ ZNET all=m
 #- *** FILE: drivers/net/ethernet/ibm/Kconfig ***
 #-
 IBMVETH ppc64=m
-ISERIES_VETH ppc64=n
 #- file drivers/net/ethernet/ibm/emac/Kconfig goes here
 
 #-
@@ -3412,6 +3447,7 @@ 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 ***
@@ -3470,6 +3506,8 @@ SEEQ8005 all=m
 #-
 SFC all=m sparc=n
 SFC_MTD all=y
+SFC_MCDI_MON all=y
+SFC_SRIOV all=y
 
 #-
 #- *** FILE: drivers/net/ethernet/silan/Kconfig ***
@@ -3633,6 +3671,7 @@ MCS_FIR all=m
 #-
 PHYLIB all=y
 #- MII PHY device drivers
+AMD_PHY all=m
 MARVELL_PHY all=m
 DAVICOM_PHY all=m
 QSEMI_PHY all=m
@@ -3738,6 +3777,7 @@ USB_KC2190 all=y
 USB_NET_ZAURUS all=m
 USB_NET_CX82310_ETH all=m
 USB_NET_KALMIA all=m
+USB_NET_QMI_WWAN all=m
 USB_HSO all=m
 USB_NET_INT51X1 all=m
 USB_CDC_PHONET all=m
@@ -3857,17 +3897,19 @@ ATH5K_TRACER all=n
 #- *** FILE: drivers/net/wireless/ath/ath6kl/Kconfig ***
 #-
 ATH6KL all=m
+ATH6KL_SDIO all=m
+ATH6KL_USB all=m
 ATH6KL_DEBUG all=n
 
 #-
 #- *** FILE: drivers/net/wireless/ath/ath9k/Kconfig ***
 #-
+ATH9K_BTCOEX_SUPPORT all=y
 ATH9K all=m
 ATH9K_PCI all=y
 ATH9K_AHB all=y
 ATH9K_DEBUGFS all=n
 ATH9K_RATE_CONTROL all=y
-ATH9K_BTCOEX_SUPPORT all=y
 ATH9K_HTC all=m
 ATH9K_HTC_DEBUGFS all=y
 
@@ -3934,9 +3976,9 @@ LIBIPW_DEBUG all=n
 #-
 #- *** FILE: drivers/net/wireless/iwlegacy/Kconfig ***
 #-
-IWLEGACY_DEBUG all=n
 IWL4965 all=m
 IWL3945 all=m
+IWLEGACY_DEBUG all=n
 
 #-
 #- *** FILE: drivers/net/wireless/iwlwifi/Kconfig ***
@@ -3946,6 +3988,7 @@ 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/iwmc3200wifi/Kconfig ***
@@ -4029,6 +4072,7 @@ RTL8192CE all=m
 RTL8192SE all=m
 RTL8192DE all=m
 RTL8192CU all=m
+RTLWIFI_DEBUG all=n
 RTL8192C_COMMON all=m
 
 #-
@@ -4089,6 +4133,7 @@ PARPORT_NOT_PC all=y
 ARCH_SUPPORTS_MSI ppc=y sparc=n sparc64=y
 PCI_MSI all=y sparc64=n
 PCI_DEBUG all=n
+PCI_REALLOC_ENABLE_AUTO all=y
 PCI_STUB all=m
 XEN_PCIDEV_FRONTEND all=m
 HT_IRQ i386=y x86_64=y
@@ -4123,6 +4168,9 @@ HOTPLUG_PCI_PCIE all=m
 #- file drivers/pci/pcie/aer/Kconfig goes here
 PCIEASPM all=y
 PCIEASPM_DEBUG all=n
+PCIEASPM_DEFAULT all=y
+PCIEASPM_POWERSAVE all=n
+PCIEASPM_PERFORMANCE all=n
 
 #-
 #- *** FILE: drivers/pci/pcie/aer/Kconfig ***
@@ -4197,14 +4245,12 @@ ASUS_NB_WMI all=m
 EEEPC_WMI all=m
 ACPI_WMI all=m
 MSI_WMI all=m
-ACPI_ASUS i386=m x86_64=m
 TOPSTAR_LAPTOP all=m
 ACPI_TOSHIBA i386=m x86_64=m
 TOSHIBA_BT_RFKILL all=m
 ACPI_CMPC all=m
 INTEL_SCU_IPC i386=y
 GPIO_INTEL_PMIC i386=y
-RAR_REGISTER all=y
 INTEL_IPS all=m
 IBM_RTL all=m
 XO15_EBOOK all=m
@@ -4212,6 +4258,7 @@ SAMSUNG_LAPTOP all=m
 MXM_WMI all=m
 INTEL_OAKTRAIL all=m
 SAMSUNG_Q10 all=m
+APPLE_GMUX all=m
 
 #-
 #- *** FILE: drivers/pnp/Kconfig ***
@@ -4253,6 +4300,7 @@ WM8350_POWER all=m
 TEST_POWER all=m
 BATTERY_DS2760 all=m
 BATTERY_DS2780 all=m
+BATTERY_DS2781 all=m
 BATTERY_DS2782 all=m
 BATTERY_PMU ppc=m
 BATTERY_SBS all=m
@@ -4269,6 +4317,8 @@ CHARGER_MAX8903 all=m
 CHARGER_LP8727 all=m
 CHARGER_GPIO all=m
 CHARGER_MANAGER all=y
+CHARGER_SMB347 all=m
+AB8500_BM all=n
 
 #-
 #- *** FILE: drivers/pps/Kconfig ***
@@ -4293,6 +4343,7 @@ PPS_CLIENT_GPIO all=m
 #- 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
 
 #-
 #- *** FILE: drivers/rapidio/Kconfig ***
@@ -4327,34 +4378,35 @@ REGULATOR_FIXED_VOLTAGE all=m
 REGULATOR_VIRTUAL_CONSUMER all=m
 REGULATOR_USERSPACE_CONSUMER all=m
 REGULATOR_GPIO all=m
-REGULATOR_BQ24022 all=m
+REGULATOR_AD5398 all=m
+REGULATOR_DA903X all=m
+REGULATOR_DA9052 all=m
+REGULATOR_MC13783 all=m
+REGULATOR_MC13892 all=m
+REGULATOR_ISL6271A all=m
 REGULATOR_MAX1586 all=m
 REGULATOR_MAX8649 all=m
 REGULATOR_MAX8660 all=m
 REGULATOR_MAX8952 all=m
-REGULATOR_TWL4030 powerpc=y
-REGULATOR_WM831X all=m
-REGULATOR_WM8350 all=m
-REGULATOR_WM8400 all=m
-REGULATOR_WM8994 all=m
-REGULATOR_DA903X all=m
-REGULATOR_DA9052 all=m
-REGULATOR_PCF50633 all=m
+REGULATOR_PCAP all=m
 REGULATOR_LP3971 all=m
 REGULATOR_LP3972 all=m
-REGULATOR_PCAP all=m
-REGULATOR_MC13783 all=m
-REGULATOR_MC13892 all=m
+REGULATOR_PCF50633 all=m
 REGULATOR_AB3100 all=m
+REGULATOR_AB8500 all=y
 REGULATOR_TPS6105X all=m
+REGULATOR_TPS62360 all=m
 REGULATOR_TPS65023 all=m
 REGULATOR_TPS6507X all=m
-REGULATOR_TPS65912 all=m
-REGULATOR_ISL6271A all=m
-REGULATOR_AD5398 all=m
-REGULATOR_AB8500 all=y
-REGULATOR_TPS6586X all=m
+REGULATOR_TPS65217 all=m
 REGULATOR_TPS6524X all=m
+REGULATOR_TPS6586X all=m
+REGULATOR_TPS65912 all=m
+REGULATOR_TWL4030 powerpc=y
+REGULATOR_WM831X all=m
+REGULATOR_WM8350 all=m
+REGULATOR_WM8400 all=m
+REGULATOR_WM8994 all=m
 
 #-
 #- *** FILE: drivers/rtc/Kconfig ***
@@ -4408,6 +4460,7 @@ RTC_DRV_DS1286 all=m
 RTC_DRV_DS1511 all=m
 RTC_DRV_DS1553 all=m
 RTC_DRV_DS1742 all=m
+RTC_DRV_DA9052 all=m
 RTC_DRV_EFI ia64=m
 RTC_DRV_STK17TA8 all=m
 RTC_DRV_M48T86 all=m
@@ -4498,10 +4551,12 @@ 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/ufs/Kconfig goes here
 SCSI_HPTIOP all=m sparc=n
 SCSI_BUSLOGIC all=m
 SCSI_FLASHPOINT i386=n
 VMWARE_PVSCSI all=m
+HYPERV_STORAGE all=m
 LIBFC all=m
 FCOE all=m
 FCOE_FNIC all=m
@@ -4577,6 +4632,7 @@ SCSI_PMCRAID all=m
 SCSI_PM8001 all=m
 SCSI_SRP all=m sparc=n
 SCSI_BFA_FC all=m
+SCSI_VIRTIO all=m
 #- file drivers/scsi/pcmcia/Kconfig goes here
 #- file drivers/scsi/device_handler/Kconfig goes here
 #- file drivers/scsi/osd/Kconfig goes here
@@ -4699,6 +4755,11 @@ SCSI_QLA_FC all=m sparc=n
 #-
 SCSI_QLA_ISCSI all=m sparc=n
 
+#-
+#- *** FILE: drivers/scsi/ufs/Kconfig ***
+#-
+SCSI_UFSHCD all=m
+
 #-
 #- *** FILE: drivers/sfi/Kconfig ***
 #-
@@ -4766,18 +4827,17 @@ STAGING all=y
 #- file drivers/staging/frontier/Kconfig goes here
 #- file drivers/staging/phison/Kconfig goes here
 #- file drivers/staging/line6/Kconfig goes here
-#- file drivers/gpu/drm/nouveau/Kconfig goes here
 #- file drivers/staging/octeon/Kconfig goes here
 #- file drivers/staging/serqt_usb2/Kconfig goes here
 #- file drivers/staging/quatech_usb2/Kconfig goes here
 #- file drivers/staging/vt6655/Kconfig goes here
 #- file drivers/staging/vt6656/Kconfig goes here
-#- file drivers/staging/hv/Kconfig goes here
 #- file drivers/staging/vme/Kconfig goes here
 #- file drivers/staging/sep/Kconfig goes here
 #- file drivers/staging/iio/Kconfig goes here
 #- file drivers/staging/zram/Kconfig goes here
 #- file drivers/staging/zcache/Kconfig goes here
+#- file drivers/staging/zsmalloc/Kconfig goes here
 #- file drivers/staging/wlags49_h2/Kconfig goes here
 #- file drivers/staging/wlags49_h25/Kconfig goes here
 #- file drivers/staging/sm7xx/Kconfig goes here
@@ -4798,6 +4858,9 @@ STAGING all=y
 #- file drivers/staging/media/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/ramster/Kconfig goes here
+#- file drivers/staging/ozwpan/Kconfig goes here
 
 #-
 #- *** FILE: drivers/staging/android/Kconfig ***
@@ -4983,15 +5046,11 @@ FT1000 all=m
 FT1000_USB all=m
 FT1000_PCMCIA all=m
 
-#-
-#- *** FILE: drivers/staging/hv/Kconfig ***
-#-
-HYPERV_STORAGE all=m
-
 #-
 #- *** FILE: drivers/staging/iio/Kconfig ***
 #-
 IIO all=m
+IIO_ST_HWMON all=m
 IIO_SW_RING all=m
 IIO_KFIFO_BUF all=m
 IIO_TRIGGER all=y
@@ -5238,6 +5297,11 @@ SOLO6X10 all=m
 #-
 INTEL_MEI all=m
 
+#-
+#- *** FILE: drivers/staging/ozwpan/Kconfig ***
+#-
+USB_WPAN_HCD all=m
+
 #-
 #- *** FILE: drivers/staging/panel/Kconfig ***
 #-
@@ -5289,7 +5353,6 @@ RTL8192U all=m
 #- *** FILE: drivers/staging/rtl8712/Kconfig ***
 #-
 R8712U all=m
-R8712_AP all=y
 
 #-
 #- *** FILE: drivers/staging/rts5139/Kconfig ***
@@ -5353,6 +5416,13 @@ 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 ***
 #-
@@ -5432,7 +5502,6 @@ ZCACHE all=m
 #-
 #- *** FILE: drivers/staging/zram/Kconfig ***
 #-
-XVMALLOC all=y
 ZRAM all=m
 ZRAM_DEBUG all=n
 
@@ -5462,13 +5531,6 @@ LOOPBACK_TARGET all=m
 #-
 TCM_FC all=m
 
-#-
-#- *** FILE: drivers/telephony/Kconfig ***
-#-
-PHONE all=m
-PHONE_IXJ all=m
-PHONE_IXJ_PCMCIA all=m
-
 #-
 #- *** FILE: drivers/thermal/Kconfig ***
 #-
@@ -5507,10 +5569,10 @@ TRACE_SINK all=m
 #-
 HVC_DRIVER ppc64=y
 HVC_CONSOLE ppc64=n
-HVC_ISERIES ppc64=n
 HVC_RTAS ppc=y ppc64=y
 HVC_BEAT ppc64=n
 HVC_XEN all=y
+HVC_XEN_FRONTEND all=y
 HVC_UDBG all=n
 HVCS ppc64=n
 
@@ -5594,10 +5656,10 @@ UIO_NETX all=m
 #-
 #- *** FILE: drivers/usb/Kconfig ***
 #-
-USB_SUPPORT all=y sparc=n
-USB_ARCH_HAS_HCD all=y
 USB_ARCH_HAS_OHCI all=y
 USB_ARCH_HAS_EHCI all=y
+USB_SUPPORT all=y sparc=n
+USB_ARCH_HAS_HCD all=y
 USB all=m sparc=n
 #- file drivers/usb/core/Kconfig goes here
 #- file drivers/usb/dwc3/Kconfig goes here
@@ -5681,6 +5743,7 @@ USB_GADGET_DUALSPEED all=y
 USB_ZERO all=m
 USB_ZERO_HNPTEST all=n
 USB_AUDIO all=m
+GADGET_UAC1 all=y
 USB_ETH all=m
 USB_ETH_RNDIS all=y
 USB_ETH_EEM all=y
@@ -5733,6 +5796,8 @@ USB_OHCI_HCD_PPC_OF_LE ppc=y ppc64=n
 USB_OHCI_HCD_PPC_OF ppc=y ppc64=y
 USB_OHCI_HCD_PCI ppc=y ppc64=y
 USB_OHCI_HCD_SSB all=y
+USB_OHCI_HCD_PLATFORM all=y
+USB_EHCI_HCD_PLATFORM all=y
 USB_OHCI_BIG_ENDIAN_DESC all=n ppc=y ppc64=y
 USB_OHCI_BIG_ENDIAN_MMIO all=n ppc=y ppc64=y
 USB_OHCI_LITTLE_ENDIAN all=y
@@ -5831,6 +5896,7 @@ USB_SERIAL_IPAQ all=m
 USB_SERIAL_IR all=m
 USB_SERIAL_EDGEPORT all=m
 USB_SERIAL_EDGEPORT_TI all=m
+USB_SERIAL_F81232 all=m
 USB_SERIAL_GARMIN all=m
 USB_SERIAL_IPW all=m
 USB_SERIAL_IUU all=m
@@ -5851,6 +5917,7 @@ USB_SERIAL_KEYSPAN_USA49WLC all=y
 USB_SERIAL_KLSI all=m
 USB_SERIAL_KOBIL_SCT all=m
 USB_SERIAL_MCT_U232 all=m
+USB_SERIAL_METRO all=m
 USB_SERIAL_MOS7720 all=m
 USB_SERIAL_MOS7715_PARPORT all=y
 USB_SERIAL_MOS7840 all=m
@@ -5985,6 +6052,7 @@ FB_RIVA all=m sparc=n
 FB_RIVA_I2C all=y sparc64=n
 FB_RIVA_DEBUG all=n
 FB_RIVA_BACKLIGHT all=y
+FB_I740 all=m
 FB_I810 i386=m
 FB_I810_GTF i386=y
 FB_I810_I2C i386=y
@@ -6053,6 +6121,7 @@ FB_MB862XX_I2C all=y
 FB_BROADSHEET all=m
 #- file drivers/video/omap/Kconfig goes here
 #- file drivers/video/omap2/Kconfig goes here
+#- file drivers/video/exynos/Kconfig goes here
 #- file drivers/video/backlight/Kconfig goes here
 #- file drivers/video/console/Kconfig goes here
 #- file drivers/video/logo/Kconfig goes here
@@ -6076,12 +6145,15 @@ BACKLIGHT_GENERIC all=m
 BACKLIGHT_PROGEAR i386=m x86_64=m
 BACKLIGHT_CARILLO_RANCH i386=m x86_64=m
 BACKLIGHT_DA903X all=m
+BACKLIGHT_DA9052 all=m
 BACKLIGHT_APPLE all=m
 BACKLIGHT_SAHARA all=m
 BACKLIGHT_WM831X all=m
 BACKLIGHT_ADP8860 all=m
 BACKLIGHT_ADP8870 all=m
 BACKLIGHT_PCF50633 all=m
+BACKLIGHT_LP855X all=m
+BACKLIGHT_OT200 all=m
 
 #-
 #- *** FILE: drivers/video/console/Kconfig ***
@@ -6106,6 +6178,11 @@ FONT_SUN8x16 ppc=n ppc64=n sparc=y sparc64=y
 FONT_SUN12x22 ppc=n ppc64=n sparc=y sparc64=y
 FONT_10x18 all=n
 
+#-
+#- *** FILE: drivers/video/exynos/Kconfig ***
+#-
+EXYNOS_VIDEO all=n
+
 #-
 #- *** FILE: drivers/video/geode/Kconfig ***
 #-
@@ -6167,6 +6244,7 @@ W1_SLAVE_DS2433 all=m
 W1_SLAVE_DS2433_CRC all=y sparc=n
 W1_SLAVE_DS2760 all=m
 W1_SLAVE_DS2780 all=m
+W1_SLAVE_DS2781 all=m
 W1_SLAVE_BQ27000 all=m
 
 #-
@@ -6248,6 +6326,7 @@ XEN_SYS_HYPERVISOR all=y
 XEN_GNTDEV all=m
 XEN_GRANT_DEV_ALLOC all=m
 XEN_PCIDEV_BACKEND all=m
+XEN_ACPI_PROCESSOR all=m
 
 #-
 #- *** FILE: fs/9p/Kconfig ***
@@ -6315,6 +6394,7 @@ MISC_FILESYSTEMS all=y
 #- file fs/omfs/Kconfig goes here
 #- file fs/hpfs/Kconfig goes here
 #- file fs/qnx4/Kconfig goes here
+#- file fs/qnx6/Kconfig goes here
 #- file fs/romfs/Kconfig goes here
 #- file fs/pstore/Kconfig goes here
 #- file fs/sysv/Kconfig goes here
@@ -6616,7 +6696,6 @@ NFS_V4 all=y
 NFS_V4_1 all=n
 NFS_FSCACHE all=y
 NFS_USE_LEGACY_DNS all=n
-NFS_USE_NEW_IDMAPPER all=y
 
 #-
 #- *** FILE: fs/nfsd/Kconfig ***
@@ -6732,6 +6811,12 @@ PSTORE all=y
 #-
 QNX4FS_FS all=m
 
+#-
+#- *** FILE: fs/qnx6/Kconfig ***
+#-
+QNX6FS_FS all=m
+QNX6FS_DEBUG all=n
+
 #-
 #- *** FILE: fs/quota/Kconfig ***
 #-
@@ -6846,7 +6931,6 @@ AUDITSYSCALL all=y
 AUDIT_LOGINUID_IMMUTABLE all=n
 #- file kernel/irq/Kconfig goes here
 TREE_RCU all=y
-RCU_TRACE all=n
 RCU_FANOUT all=32 alpha=64 ia64=64 ppc64=64 sparc64=64 x86_64=64
 RCU_FANOUT_EXACT all=n
 RCU_FAST_NO_HZ all=y
@@ -7010,6 +7094,11 @@ CRC16 all=m
 CRC_T10DIF all=m
 CRC_ITU_T all=m
 CRC32 all=y
+CRC32_SELFTEST all=n
+CRC32_SLICEBY8 all=y
+CRC32_SLICEBY4 all=n
+CRC32_SARWATE all=n
+CRC32_BIT all=n
 CRC7 all=m
 LIBCRC32C all=m
 CRC8 all=m
@@ -7094,6 +7183,8 @@ FRAME_POINTER i386=y x86_64=y
 BOOT_PRINTK_DELAY all=n
 RCU_TORTURE_TEST all=m
 RCU_CPU_STALL_TIMEOUT all=60
+RCU_CPU_STALL_INFO all=n
+RCU_TRACE all=n
 KPROBES_SANITY_TEST all=n
 BACKTRACE_SELF_TEST all=m
 DEBUG_BLOCK_EXT_DEVT all=n
@@ -7103,7 +7194,6 @@ LKDTM all=m
 CPU_NOTIFIER_ERROR_INJECT all=m
 FAULT_INJECTION all=n
 LATENCYTOP all=n
-SYSCTL_SYSCALL_CHECK all=n
 #- file mm/Kconfig.debug goes here
 #- file kernel/trace/Kconfig goes here
 PROVIDE_OHCI1394_DMA_INIT all=n
@@ -7498,7 +7588,6 @@ IP_NF_MATCH_RPFILTER all=m
 IP_NF_MATCH_TTL all=m
 IP_NF_FILTER all=m
 IP_NF_TARGET_REJECT all=m
-IP_NF_TARGET_LOG all=m
 IP_NF_TARGET_ULOG all=m
 NF_NAT all=m
 IP_NF_TARGET_MASQUERADE all=m
@@ -7558,7 +7647,6 @@ IP6_NF_MATCH_MH all=m
 IP6_NF_MATCH_RPFILTER all=m
 IP6_NF_MATCH_RT all=m
 IP6_NF_TARGET_HL all=m
-IP6_NF_TARGET_LOG all=m
 IP6_NF_FILTER all=m
 IP6_NF_TARGET_REJECT all=m
 IP6_NF_MANGLE all=m
@@ -7650,6 +7738,7 @@ NF_CONNTRACK_SECMARK all=y
 NF_CONNTRACK_ZONES all=y
 NF_CONNTRACK_PROCFS all=n
 NF_CONNTRACK_EVENTS all=y
+NF_CONNTRACK_TIMEOUT all=y
 NF_CONNTRACK_TIMESTAMP all=y
 NF_CT_PROTO_DCCP=m
 NF_CT_PROTO_SCTP all=m
@@ -7665,8 +7754,8 @@ NF_CONNTRACK_PPTP all=m
 NF_CONNTRACK_SANE all=m
 NF_CONNTRACK_SIP all=m
 NF_CONNTRACK_TFTP all=m
-NF_CONNTRACK_RTSP all=m
 NF_CT_NETLINK all=m
+NF_CT_NETLINK_TIMEOUT all=m
 NETFILTER_TPROXY all=m
 NETFILTER_XTABLES all=m
 #- Xtables combined modules
@@ -7683,6 +7772,7 @@ NETFILTER_XT_TARGET_CT all=m
 NETFILTER_XT_TARGET_DSCP all=m
 NETFILTER_XT_TARGET_IDLETIMER all=m
 NETFILTER_XT_TARGET_LED all=m
+NETFILTER_XT_TARGET_LOG all=m
 NETFILTER_XT_TARGET_MARK all=m
 NETFILTER_XT_TARGET_NFLOG all=m
 NETFILTER_XT_TARGET_NFQUEUE all=m
@@ -7869,6 +7959,7 @@ NET_SCH_MQPRIO all=m
 NET_SCH_CHOKE all=m
 NET_SCH_QFQ all=m
 NET_SCH_INGRESS all=m
+NET_SCH_PLUG all=m
 #- Classification
 NET_CLS all=y
 NET_CLS_BASIC all=m
@@ -7921,6 +8012,7 @@ SUNRPC all=m
 SUNRPC_GSS all=m
 SUNRPC_XPRT_RDMA all=m
 RPCSEC_GSS_KRB5 all=m
+SUNRPC_DEBUG all=n
 
 #-
 #- *** FILE: net/tipc/Kconfig ***
@@ -8001,11 +8093,13 @@ LSM_MMAP_MIN_ADDR all=0 x86_64=65536 i386=65536 sparc64=8192 ppc=65536
 #- file security/smack/Kconfig goes here
 #- file security/tomoyo/Kconfig goes here
 #- file security/apparmor/Kconfig goes here
+#- file security/yama/Kconfig goes here
 #- file security/integrity/Kconfig goes here
 DEFAULT_SECURITY_SELINUX all=n
 DEFAULT_SECURITY_SMACK all=n
 DEFAULT_SECURITY_TOMOYO all=n
 DEFAULT_SECURITY_APPARMOR=n
+DEFAULT_SECURITY_YAMA all=n
 DEFAULT_SECURITY_DAC all=y
 DEFAULT_SECURITY all=""
 
@@ -8014,7 +8108,6 @@ DEFAULT_SECURITY all=""
 #-
 SECURITY_APPARMOR=y
 SECURITY_APPARMOR_BOOTPARAM_VALUE=1
-SECURITY_APPARMOR_COMPAT_24=y
 
 #-
 #- *** FILE: security/integrity/ima/Kconfig ***
@@ -8048,6 +8141,11 @@ SECURITY_TOMOYO_OMIT_USERSPACE_LOADER all=n
 SECURITY_TOMOYO_POLICY_LOADER all="/sbin/tomoyo-init"
 SECURITY_TOMOYO_ACTIVATION_TRIGGER all="/sbin/init"
 
+#-
+#- *** FILE: security/yama/Kconfig ***
+#-
+SECURITY_YAMA all=y
+
 #-
 #- *** FILE: sound/Kconfig ***
 #-
@@ -8438,6 +8536,7 @@ INITRAMFS_COMPRESSION_LZMA all=n
 #-
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
+ACPI_ASUS i386=m x86_64=m
 AD2S120X all=m
 AD2S1210_GPIO_INPUT all=n
 AD2S1210_GPIO_NONE all=y
@@ -8447,6 +8546,7 @@ AD7745 all=m
 ADT75 all=m
 ATH6K_LEGACY all=n
 BATTERY_BQ20Z75 all=m
+BRIQ_PANEL ppc=m
 BT_L2CAP all=y
 BT_SCO all=y
 COMPUTONE all=m
@@ -8466,6 +8566,14 @@ ET131X_DEBUG all=n
 GPIO_BASIC_MMIO all=m
 GPIO_BASIC_MMIO_CORE all=m
 HID_QUANTA all=m
+HID_ROCCAT_ARVO all=m
+HID_ROCCAT_COMMON all=m
+HID_ROCCAT_ISKU all=m
+HID_ROCCAT_KONE all=m
+HID_ROCCAT_KONEPLUS all=m
+HID_ROCCAT_KOVAPLUS all=m
+HID_ROCCAT_PYRA all=m
+HVC_ISERIES ppc64=n
 HYPERV_BLOCK all=m
 HYPERV_MOUSE all=m
 I2C_DESIGNWARE powerpc=m
@@ -8478,6 +8586,9 @@ IBM_NEW_EMAC_RX_SKB_HEADROOM ppc64=0
 IBM_NEW_EMAC_TXB ppc64=64
 IIO_RING_BUFFER all=y
 INPUT_ATI_REMOTE all=m sparc=n
+IP6_NF_TARGET_LOG all=m
+IP_NF_TARGET_LOG all=m
+ISERIES_VETH ppc64=n
 ISTALLION all=m
 IWLAGN all=m
 IWLWIFI_DEVICE_SVTOOL all=y
@@ -8488,6 +8599,7 @@ IWL_P2P all=n
 LEDS_ALIX2 all=m
 LEDS_GPIO_OF powerpc=y sparc=y
 LEDS_GPIO_PLATFORM all=y
+LEDS_NET5501 all=m
 LOGIWII_FF all=y
 LOOPBACK_TARGET_CDB_DEBUG all=n
 MFD_SUPPORT all=y
@@ -8505,13 +8617,19 @@ NET_POCKET all=y
 NET_VENDOR_SMC alpha=y i386=y
 NFC_DEVICES all=y
 NFSD_DEPRECATED all=n
+NFS_USE_NEW_IDMAPPER all=y
+NF_CONNTRACK_RTSP all=m
 POHMELFS all=m
 POHMELFS_CRYPTO all=y
 POHMELFS_DEBUG all=n
+R8712_AP all=y
+RAR_REGISTER all=y
+REGULATOR_BQ24022 all=m
 RIO all=m
 RIO_OLDPCI all=n ia64=y ppc=y ppc64=y
 RISCOM8 all=m
 SCSI_ARCMSR_AER all=y
+SECURITY_APPARMOR_COMPAT_24=y
 SERIAL_MAX3107_AAVA all=m
 SIGMA all=m
 SND_INTELMID all=n
@@ -8527,6 +8645,7 @@ SPECTRA_MTD all=y
 STALLION all=m
 STMMAC_DUAL_MAC all=y
 SX all=m
+SYSCTL_SYSCALL_CHECK all=n
 USB_GADGET_AMD5536UDC all=n
 USB_GADGET_AT91 all=n
 USB_GADGET_ATMEL_USBA all=n
@@ -8549,3 +8668,4 @@ USB_LANGWELL_OTG all=m
 WL12XX_HT all=y
 WL12XX_SDIO_TEST all=m
 XEN_PLATFORM_PCI all=m
+XVMALLOC all=y