- ressurect pc speaker driver

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

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 319e939e8e64b0cf50b28c7d83c63f8cf42f00ed..758ee4aa4c213c6972255c4a4366069e09590d0d 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -3,12 +3,15 @@
 #- *** 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
+DEBUG_TLBFLUSH all=n
 DMI all=y
 EFI_STUB all=y
 GART_IOMMU all=y
@@ -138,8 +141,11 @@ 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
+CRYPTO_CAST6_AVX_X86_64 all=m
 CRYPTO_DES all=m
 CRYPTO_FCRYPT all=m
 CRYPTO_KHAZAD all=m
@@ -166,6 +172,15 @@ CRYPTO_ANSI_CPRNG all=m
 CRYPTO_USER_API_HASH all=m
 CRYPTO_USER_API_SKCIPHER all=m
 #- file drivers/crypto/Kconfig goes here
+#- file crypto/asymmetric_keys/Kconfig goes here
+
+#-
+#- *** FILE: crypto/asymmetric_keys/Kconfig ***
+#-
+ASYMMETRIC_KEY_TYPE all=m
+ASYMMETRIC_PUBLIC_KEY_SUBTYPE all=m
+PUBLIC_KEY_ALGO_RSA all=m
+X509_CERTIFICATE_PARSER all=m
 
 #-
 #- *** FILE: drivers/accessibility/Kconfig ***
@@ -196,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
@@ -205,7 +221,7 @@ ACPI_HOTPLUG_MEMORY all=m
 ACPI_SBS x86=m
 ACPI_HED all=m
 ACPI_CUSTOM_METHOD all=m
-ACPI_BGRT all=m
+ACPI_BGRT all=y
 #- file drivers/acpi/apei/Kconfig goes here
 
 #-
@@ -241,6 +257,7 @@ SATA_SX4 all=m sparc=n
 ATA_BMDMA all=y
 #- SATA SFF controllers with BMDMA
 ATA_PIIX all=m sparc=n
+SATA_HIGHBANK all=m
 SATA_MV all=m sparc=n
 SATA_NV all=m sparc=n
 SATA_PROMISE all=m sparc=n
@@ -377,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
 
 #-
@@ -403,7 +421,6 @@ BLK_DEV_NBD all=m
 BLK_DEV_NVME all=m
 BLK_DEV_OSD all=m
 BLK_DEV_SX8 all=m
-BLK_DEV_UB all=n
 BLK_DEV_RAM all=y
 BLK_DEV_RAM_COUNT all=16
 BLK_DEV_RAM_SIZE all=16384
@@ -423,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
 
@@ -483,6 +500,11 @@ BT_MRVL_SDIO all=m
 BT_ATH3K all=m
 BT_WILINK all=m
 
+#-
+#- *** FILE: drivers/bus/Kconfig ***
+#-
+OMAP_OCP2SCP all=m
+
 #-
 #- *** FILE: drivers/char/Kconfig ***
 #-
@@ -560,6 +582,7 @@ HW_RANDOM_N2RNG sparc64=m
 HW_RANDOM_VIA all=m
 HW_RANDOM_PASEMI ppc64=m
 HW_RANDOM_VIRTIO=m
+HW_RANDOM_TPM all=m
 
 #-
 #- *** FILE: drivers/char/ipmi/Kconfig ***
@@ -586,6 +609,7 @@ IPWIRELESS all=m
 TCG_TPM all=m x86=y ia64=y
 #* TCG_TIS forced to 'y' by IMA
 TCG_TIS all=m x86=y ia64=y
+TCG_TIS_I2C_INFINEON all=m
 TCG_NSC all=m
 TCG_ATMEL all=m
 TCG_INFINEON all=m
@@ -603,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
@@ -621,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 ***
@@ -634,6 +659,7 @@ CRYPTO_DEV_HIFN_795X all=m
 CRYPTO_DEV_HIFN_795X_RNG all=y
 #- file drivers/crypto/caam/Kconfig goes here
 CRYPTO_DEV_TALITOS all=m
+#- file drivers/crypto/nx/Kconfig goes here
 #- file drivers/crypto/ux500/Kconfig goes here
 
 #-
@@ -669,7 +695,6 @@ DMATEST all=n
 #-
 EDAC all=y
 EDAC_LEGACY_SYSFS all=y
-#- Reporting subsystems
 EDAC_DEBUG all=n
 EDAC_DECODE_MCE all=m
 EDAC_MCE_INJ all=m
@@ -692,8 +717,6 @@ EDAC_I5000 i386=m x86_64=m
 EDAC_I5100 i386=m x86_64=m
 EDAC_I7300 all=m
 EDAC_SBRIDGE all=m
-VFIO all=m
-VFIO_PCI all=m
 EDAC_PASEMI ppc64=m
 EDAC_CELL ppc64=m
 EDAC_AMD8131 powerpc=m
@@ -713,19 +736,13 @@ EISA_NAMES alpha=y i386=y
 EXTCON all=m
 #- Extcon Device Drivers
 EXTCON_GPIO all=m
+EXTCON_ADC_JACK all=m
 EXTCON_ARIZONA all=m
 
-AD7266 all=m
-ADJD_S311 all=m
-SENSORS_LM3533 all=m
-VCNL4000 all=m
-AD9523 all=m
-ADF4350 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
@@ -760,15 +777,17 @@ GOOGLE_MEMCONSOLE all=m
 GPIOLIB all=y
 DEBUG_GPIO all=n
 GPIO_SYSFS all=y
+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
 GPIO_VX855 all=m
-GPIO_ARIZONA all=m
 #- I2C GPIO expanders:
+GPIO_ARIZONA all=m
 GPIO_MAX7300 all=m
 GPIO_MAX732X all=m
 GPIO_PCA953X all=m
@@ -798,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 ***
@@ -823,6 +844,8 @@ DRM_SAVAGE all=m
 #- file drivers/gpu/drm/ast/Kconfig goes here
 #- 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 ***
@@ -850,8 +873,9 @@ DRM_MGAG200 all=m
 #- *** FILE: drivers/gpu/drm/nouveau/Kconfig ***
 #-
 DRM_NOUVEAU all=m
+NOUVEAU_DEBUG all=5
+NOUVEAU_DEBUG_DEFAULT all=3
 DRM_NOUVEAU_BACKLIGHT all=y
-DRM_NOUVEAU_DEBUG all=n
 DRM_I2C_CH7006 all=m
 DRM_I2C_SIL164 all=m
 
@@ -912,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
@@ -937,6 +962,7 @@ HID_PICOLCD_BACKLIGHT all=y
 HID_PICOLCD_LCD all=y
 HID_PICOLCD_LEDS all=y
 HID_PRIMAX all=m
+HID_PS3REMOTE all=m
 HID_ROCCAT all=m
 HID_SAITEK all=m
 HID_SAMSUNG all=m
@@ -958,7 +984,14 @@ HID_WIIMOTE_EXT all=y
 HID_ZEROPLUS all=m
 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 ***
@@ -987,6 +1020,7 @@ HSI_CHAR all=m
 #-
 HYPERV all=m
 HYPERV_UTILS all=m
+HYPERV_BALLOON all=m
 
 #-
 #- *** FILE: drivers/hwmon/Kconfig ***
@@ -1007,6 +1041,7 @@ SENSORS_ADM1026 all=m
 SENSORS_ADM1029 all=m
 SENSORS_ADM1031 all=m
 SENSORS_ADM9240 all=m
+SENSORS_ADT7410 all=m
 SENSORS_ADT7411 all=m
 SENSORS_ADT7462 all=m
 SENSORS_ADT7470 all=m
@@ -1059,6 +1094,7 @@ SENSORS_MAX1111 all=m
 SENSORS_MAX16065 all=m
 SENSORS_MAX1619 all=m
 SENSORS_MAX1668 all=m
+SENSORS_MAX197 all=m
 SENSORS_MAX6639 all=m
 SENSORS_MAX6642 all=m
 SENSORS_MAX6650 all=m
@@ -1140,6 +1176,7 @@ I2C_MUX all=m
 I2C_HELPER_AUTO all=y
 #- file drivers/i2c/algos/Kconfig goes here
 #- file drivers/i2c/busses/Kconfig goes here
+I2C_STUB all=m
 I2C_DEBUG_CORE all=n
 I2C_DEBUG_ALGO all=n
 I2C_DEBUG_BUS all=n
@@ -1178,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
@@ -1195,10 +1233,10 @@ 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
-I2C_STUB all=m
 SCx200_I2C i386=m
 SCx200_I2C_SCL i386=12
 SCx200_I2C_SDA i386=13
@@ -1291,29 +1329,102 @@ BLK_DEV_UMC8672 alpha=m i386=m
 INTEL_IDLE all=n i386=y x86_64=y
 I7300_IDLE x86_64=m
 
-#-
-#- *** FILE: drivers/ieee802154/Kconfig ***
-#-
-IEEE802154_DRIVERS all=m
-IEEE802154_FAKEHARD all=m
-IEEE802154_FAKELB all=m
-IEEE802154_AT86RF230 all=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/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
+
+#-
+#- *** FILE: drivers/iio/accel/Kconfig ***
+#-
+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 ***
 #-
 AD8366 all=m
 
+#-
+#- *** FILE: drivers/iio/common/hid-sensors/Kconfig ***
+#-
+HID_SENSOR_ENUM_BASE_QUIRKS all=y
+
+#-
+#- *** FILE: drivers/iio/dac/Kconfig ***
+#-
+AD5064 all=m
+AD5360 all=m
+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
+AD5791 all=m
+AD5686 all=m
+MAX517 all=m
+MCP4725 all=m
+
+#-
+#- *** FILE: drivers/iio/frequency/Kconfig ***
+#-
+AD9523 all=m
+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 ***
+#-
+ADJD_S311 all=m
+SENSORS_LM3533 all=m
+VCNL4000 all=m
+HID_SENSOR_ALS all=m
+
+#-
+#- *** FILE: drivers/iio/magnetometer/Kconfig ***
+#-
+HID_SENSOR_MAGNETOMETER_3D all=m
+
 #-
 #- *** FILE: drivers/infiniband/Kconfig ***
 #-
@@ -1520,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
@@ -1538,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
@@ -1592,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 ***
@@ -1644,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
@@ -1688,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 ***
 #-
@@ -1829,6 +1962,7 @@ LEDS_CLASS all=y
 #- LED drivers
 LEDS_LM3530 all=m
 LEDS_LM3533 all=m
+LEDS_LM3642 all=m
 LEDS_NET48XX i386=m
 LEDS_WRAP i386=m
 LEDS_SUNFIRE sparc64=m
@@ -1853,9 +1987,9 @@ LEDS_LT3593 all=m
 LEDS_DELL_NETBOOKS all=m
 LEDS_MC13783 all=m
 LEDS_TCA6507 all=m
-LEDS_LM3556 all=m
-LEDS_BLINKM all=m
+LEDS_LM355x all=m
 LEDS_OT200 all=m
+LEDS_BLINKM all=m
 LEDS_TRIGGERS all=y
 #- LED Triggers
 LEDS_TRIGGER_TIMER all=m
@@ -1863,6 +1997,7 @@ LEDS_TRIGGER_ONESHOT all=m
 LEDS_TRIGGER_IDE_DISK all=y
 LEDS_TRIGGER_HEARTBEAT all=m
 LEDS_TRIGGER_BACKLIGHT all=m
+LEDS_TRIGGER_CPU all=y
 LEDS_TRIGGER_GPIO all=m
 LEDS_TRIGGER_DEFAULT_ON all=m
 #- iptables trigger is under Netfilter config (LED target)
@@ -1920,7 +2055,6 @@ DM_CRYPT all=m
 DM_SNAPSHOT all=m
 DM_THIN_PROVISIONING all=m
 DM_DEBUG_BLOCK_STACK_TRACING all=n
-DM_DEBUG_SPACE_MAPS all=n
 DM_MIRROR all=m
 DM_RAID all=m
 DM_LOG_USERSPACE all=m
@@ -1937,148 +2071,63 @@ DM_VERITY all=m
 #- *** FILE: drivers/media/Kconfig ***
 #-
 MEDIA_SUPPORT all=m
+#- Multimedia core support
 MEDIA_CAMERA_SUPPORT all=y
 MEDIA_ANALOG_TV_SUPPORT all=y
 MEDIA_DIGITAL_TV_SUPPORT all=y
 MEDIA_RADIO_SUPPORT all=y
 MEDIA_RC_SUPPORT all=y
-#- Multimedia core support
 MEDIA_CONTROLLER all=y
 VIDEO_DEV all=m
-VIDEO_V4L2_COMMON all=m
 VIDEO_V4L2_SUBDEV_API all=y
+#- file drivers/media/v4l2-core/Kconfig goes here
 DVB_CORE all=m
 DVB_NET all=y
-#- Multimedia drivers
-#- file drivers/media/common/Kconfig goes here
+#- file drivers/media/dvb-core/Kconfig goes here
+#- Media drivers
 #- file drivers/media/rc/Kconfig goes here
-#- file drivers/media/common/tuners/Kconfig goes here
-#- file drivers/media/video/Kconfig goes here
+#- file drivers/media/usb/Kconfig goes here
+#- file drivers/media/pci/Kconfig goes here
+#- file drivers/media/platform/Kconfig goes here
+#- file drivers/media/mmc/Kconfig goes here
+#- file drivers/media/parport/Kconfig goes here
 #- file drivers/media/radio/Kconfig goes here
-#- file drivers/media/dvb/Kconfig goes here
-
-#-
-#- *** FILE: drivers/media/common/Kconfig ***
-#-
-VIDEO_SAA7146 all=m
-VIDEO_SAA7146_VV all=m
-
-#-
-#- *** FILE: drivers/media/common/tuners/Kconfig ***
-#-
-MEDIA_ATTACH all=y
-MEDIA_TUNER_CUSTOMISE all=n
-MEDIA_TUNER_TDA18212 all=m
-
-#-
-#- *** FILE: drivers/media/dvb/Kconfig ***
-#-
-DVB_MAX_ADAPTERS all=8
-DVB_DYNAMIC_MINORS all=y
-DVB_CAPTURE_DRIVERS all=y
-#- Supported SAA7146 based PCI Adapters
-#- file drivers/media/dvb/ttpci/Kconfig goes here
-#- Supported USB Adapters
-#- file drivers/media/dvb/dvb-usb/Kconfig goes here
-#- file drivers/media/dvb/ttusb-budget/Kconfig goes here
-#- file drivers/media/dvb/ttusb-dec/Kconfig goes here
-#- file drivers/media/dvb/siano/Kconfig goes here
-#- Supported FlexCopII (B2C2) Adapters
-#- file drivers/media/dvb/b2c2/Kconfig goes here
-#- Supported BT878 Adapters
-#- file drivers/media/dvb/bt8xx/Kconfig goes here
-#- Supported Pluto2 Adapters
-#- file drivers/media/dvb/pluto2/Kconfig goes here
-#- Supported SDMC DM1105 Adapters
-#- file drivers/media/dvb/dm1105/Kconfig goes here
 #- Supported FireWire (IEEE 1394) Adapters
-#- file drivers/media/dvb/firewire/Kconfig goes here
-#- Supported Earthsoft PT1 Adapters
-#- file drivers/media/dvb/pt1/Kconfig goes here
-#- Supported Mantis Adapters
-#- file drivers/media/dvb/mantis/Kconfig goes here
-#- Supported nGene Adapters
-#- file drivers/media/dvb/ngene/Kconfig goes here
-#- Supported ddbridge ('Octopus') Adapters
-#- file drivers/media/dvb/ddbridge/Kconfig goes here
-#- Supported DVB Frontends
-#- file drivers/media/dvb/frontends/Kconfig goes here
+#- file drivers/media/firewire/Kconfig goes here
+#- file drivers/media/common/Kconfig goes here
+MEDIA_SUBDRV_AUTOSELECT all=y
+#- Media ancillary drivers (tuners, sensors, i2c, frontends)
+#- file drivers/media/i2c/Kconfig goes here
+#- file drivers/media/tuners/Kconfig goes here
+#- file drivers/media/dvb-frontends/Kconfig goes here
 
 #-
-#- *** FILE: drivers/media/dvb/b2c2/Kconfig ***
+#- *** FILE: drivers/media/common/b2c2/Kconfig ***
 #-
 DVB_B2C2_FLEXCOP all=m
-DVB_B2C2_FLEXCOP_PCI all=m sparc=n
-DVB_B2C2_FLEXCOP_USB alpha=m ia64=m i386=m ppc=m ppc64=m sparc64=m x86_64=m
 DVB_B2C2_FLEXCOP_DEBUG all=n
 
 #-
-#- *** FILE: drivers/media/dvb/bt8xx/Kconfig ***
-#-
-DVB_BT8XX all=m
-
-#-
-#- *** FILE: drivers/media/dvb/ddbridge/Kconfig ***
-#-
-DVB_DDBRIDGE all=m
-
-#-
-#- *** FILE: drivers/media/dvb/dm1105/Kconfig ***
+#- *** FILE: drivers/media/common/saa7146/Kconfig ***
 #-
-DVB_DM1105 all=m
+VIDEO_SAA7146 all=m
+VIDEO_SAA7146_VV all=m
 
 #-
-#- *** FILE: drivers/media/dvb/dvb-usb/Kconfig ***
+#- *** FILE: drivers/media/common/siano/Kconfig ***
 #-
-DVB_USB all=m
-DVB_USB_DEBUG all=n
-DVB_USB_A800 all=m
-DVB_USB_DIBUSB_MB all=m
-DVB_USB_DIBUSB_MB_FAULTY all=n
-DVB_USB_DIBUSB_MC all=m
-DVB_USB_DIB0700 all=m
-DVB_USB_UMT_010 all=m
-DVB_USB_CXUSB all=m
-DVB_USB_M920X all=m
-DVB_USB_GL861 all=m
-DVB_USB_AU6610 all=m
-DVB_USB_DIGITV all=m
-DVB_USB_VP7045 all=m
-DVB_USB_VP702X all=m
-DVB_USB_GP8PSK all=m
-DVB_USB_NOVA_T_USB2 all=m
-DVB_USB_TTUSB2 all=m
-DVB_USB_DTT200U all=m
-DVB_USB_OPERA1 all=m
-DVB_USB_AF9005 all=m
-DVB_USB_AF9005_REMOTE all=m
-DVB_USB_PCTV452E all=m
-DVB_USB_DW2102 all=m
-DVB_USB_CINERGY_T2 all=m
-DVB_USB_ANYSEE all=m
-DVB_USB_DTV5100 all=m
-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
-DVB_USB_AF9035 all=m
+SMS_SIANO_MDTV all=m
+SMS_SIANO_RC all=y
 
 #-
-#- *** FILE: drivers/media/dvb/firewire/Kconfig ***
+#- *** FILE: drivers/media/dvb-core/Kconfig ***
 #-
-DVB_FIREDTV all=m
+DVB_MAX_ADAPTERS all=8
+DVB_DYNAMIC_MINORS all=y
 
 #-
-#- *** FILE: drivers/media/dvb/frontends/Kconfig ***
+#- *** FILE: drivers/media/dvb-frontends/Kconfig ***
 #-
-DVB_FE_CUSTOMISE all=n
 #- Multistandard (satellite) frontends
 #- Multistandard (cable + terrestrial) frontends
 #- DVB-S (satellite) frontends
@@ -2137,54 +2186,286 @@ DVB_LGS8GL5 all=m
 #- Tools to develop new frontends
 
 #-
-#- *** FILE: drivers/media/dvb/mantis/Kconfig ***
+#- *** FILE: drivers/media/firewire/Kconfig ***
 #-
-MANTIS_CORE all=m
-DVB_MANTIS all=m
-DVB_HOPPER all=m
+DVB_FIREDTV all=m
 
 #-
-#- *** FILE: drivers/media/dvb/ngene/Kconfig ***
+#- *** FILE: drivers/media/i2c/Kconfig ***
 #-
-DVB_NGENE all=m
+VIDEO_BTCX all=m sparc=
+VIDEO_TVEEPROM all=m
+#- Audio decoders, processors and mixers
+VIDEO_TVAUDIO all=m
+VIDEO_TDA7432 all=m
+VIDEO_TDA9840 all=m
+VIDEO_TEA6415C all=m
+VIDEO_TEA6420 all=m
+VIDEO_MSP3400 all=m
+VIDEO_CS53L32A all=m
+VIDEO_WM8775 all=m
+VIDEO_WM8739 all=m
+VIDEO_VP27SMPX ia64=m
+#- RDS decoders
+VIDEO_SAA6588 all=m
+#- Video decoders
+VIDEO_BT819 all=m
+VIDEO_BT856 all=m
+VIDEO_KS0127 all=m
+VIDEO_SAA7110 all=m
+VIDEO_SAA711X all=m
+VIDEO_TVP5150 all=m
+VIDEO_VPX3220 all=m
+#- Video and audio decoders
+#- file drivers/media/i2c/cx25840/Kconfig goes here
+#- MPEG video encoders
+VIDEO_CX2341X all=m
+#- Video encoders
+VIDEO_SAA7127 all=m
+VIDEO_SAA7185 all=m
+VIDEO_ADV7170 all=m
+VIDEO_ADV7175 all=m
+#- Camera sensor devices
+VIDEO_OV7670 all=m
+VIDEO_SR030PC30 all=m
+VIDEO_NOON010PC30 all=m
+#- file drivers/media/i2c/m5mols/Kconfig goes here
+#- file drivers/media/i2c/smiapp/Kconfig goes here
+#- Flash devices
+#- Video improvement chips
+VIDEO_UPD64031A all=m
+VIDEO_UPD64083 all=m
+#- Miscelaneous helper chips
+#- file drivers/media/i2c/soc_camera/Kconfig goes here
 
 #-
-#- *** FILE: drivers/media/dvb/pluto2/Kconfig ***
+#- *** FILE: drivers/media/i2c/cx25840/Kconfig ***
 #-
-DVB_PLUTO2 all=m sparc=n
+VIDEO_CX25840 all=m
 
 #-
-#- *** FILE: drivers/media/dvb/pt1/Kconfig ***
+#- *** FILE: drivers/media/i2c/m5mols/Kconfig ***
 #-
-DVB_PT1 all=m
+VIDEO_M5MOLS all=m
 
 #-
-#- *** FILE: drivers/media/dvb/siano/Kconfig ***
+#- *** FILE: drivers/media/i2c/soc_camera/Kconfig ***
 #-
-SMS_SIANO_MDTV all=m
-SMS_USB_DRV all=m
-SMS_SDIO_DRV all=m
+#- soc_camera sensor drivers
+SOC_CAMERA_IMX074 all=m
+SOC_CAMERA_MT9M001 all=m
+SOC_CAMERA_MT9M111 all=m
+SOC_CAMERA_MT9T031 all=m
+SOC_CAMERA_MT9T112 all=m
+SOC_CAMERA_MT9V022 all=m
+SOC_CAMERA_OV2640 all=m
+SOC_CAMERA_OV5642 all=m
+SOC_CAMERA_OV6650 all=m
+SOC_CAMERA_OV772X all=m
+SOC_CAMERA_OV9640 all=m
+SOC_CAMERA_OV9740 all=m
+SOC_CAMERA_RJ54N1 all=m
+SOC_CAMERA_TW9910 all=m
 
 #-
-#- *** FILE: drivers/media/dvb/ttpci/Kconfig ***
+#- *** FILE: drivers/media/mmc/siano/Kconfig ***
 #-
-DVB_AV7110 all=m sparc=n
-DVB_AV7110_OSD all=y
-DVB_BUDGET_CORE all=m
-DVB_BUDGET all=m sparc=n
-DVB_BUDGET_CI all=m sparc=n
-DVB_BUDGET_AV all=m sparc=n
-DVB_BUDGET_PATCH all=m
+SMS_SDIO_DRV all=m
 
 #-
-#- *** FILE: drivers/media/dvb/ttusb-budget/Kconfig ***
+#- *** FILE: drivers/media/parport/Kconfig ***
 #-
-DVB_TTUSB_BUDGET all=m
+MEDIA_PARPORT_SUPPORT all=y
+VIDEO_BWQCAM all=m
+VIDEO_CQCAM all=m
+VIDEO_PMS all=m
+VIDEO_W9966 all=m
 
 #-
-#- *** FILE: drivers/media/dvb/ttusb-dec/Kconfig ***
+#- *** FILE: drivers/media/pci/Kconfig ***
+#-
+MEDIA_PCI_SUPPORT all=y
+#- Media capture support
+#- file drivers/media/pci/meye/Kconfig goes here
+#- file drivers/media/pci/sta2x11/Kconfig goes here
+#- Media capture/analog TV support
+#- file drivers/media/pci/ivtv/Kconfig goes here
+#- file drivers/media/pci/zoran/Kconfig goes here
+#- file drivers/media/pci/saa7146/Kconfig goes here
+#- Media capture/analog/hybrid TV support
+#- file drivers/media/pci/cx18/Kconfig goes here
+#- file drivers/media/pci/cx23885/Kconfig goes here
+#- file drivers/media/pci/cx25821/Kconfig goes here
+#- file drivers/media/pci/cx88/Kconfig goes here
+#- file drivers/media/pci/bt8xx/Kconfig goes here
+#- file drivers/media/pci/saa7134/Kconfig goes here
+#- file drivers/media/pci/saa7164/Kconfig goes here
+#- Media digital TV PCI Adapters
+#- file drivers/media/pci/ttpci/Kconfig goes here
+#- file drivers/media/pci/b2c2/Kconfig goes here
+#- file drivers/media/pci/pluto2/Kconfig goes here
+#- file drivers/media/pci/dm1105/Kconfig goes here
+#- file drivers/media/pci/pt1/Kconfig goes here
+#- file drivers/media/pci/mantis/Kconfig goes here
+#- file drivers/media/pci/ngene/Kconfig goes here
+#- file drivers/media/pci/ddbridge/Kconfig goes here
+
+#-
+#- *** FILE: drivers/media/pci/b2c2/Kconfig ***
 #-
-DVB_TTUSB_DEC all=m
+DVB_B2C2_FLEXCOP_PCI all=m sparc=n
+DVB_B2C2_FLEXCOP_PCI_DEBUG all=n
+
+#-
+#- *** FILE: drivers/media/pci/bt8xx/Kconfig ***
+#-
+VIDEO_BT848 all=m sparc=n
+DVB_BT8XX all=m
+
+#-
+#- *** FILE: drivers/media/pci/cx18/Kconfig ***
+#-
+VIDEO_CX18 all=m sparc=n
+VIDEO_CX18_ALSA all=m
+
+#-
+#- *** FILE: drivers/media/pci/cx23885/Kconfig ***
+#-
+VIDEO_CX23885 all=m sparc=n
+MEDIA_ALTERA_CI all=m
+
+#-
+#- *** FILE: drivers/media/pci/cx25821/Kconfig ***
+#-
+VIDEO_CX25821 all=m
+VIDEO_CX25821_ALSA all=m
+
+#-
+#- *** FILE: drivers/media/pci/cx88/Kconfig ***
+#-
+VIDEO_CX88 all=m sparc=n
+VIDEO_CX88_ALSA all=m
+VIDEO_CX88_BLACKBIRD all=m
+VIDEO_CX88_DVB all=m sparc64=n
+VIDEO_CX88_VP3054 all=m
+
+#-
+#- *** FILE: drivers/media/pci/ddbridge/Kconfig ***
+#-
+DVB_DDBRIDGE all=m
+
+#-
+#- *** FILE: drivers/media/pci/dm1105/Kconfig ***
+#-
+DVB_DM1105 all=m
+
+#-
+#- *** FILE: drivers/media/pci/ivtv/Kconfig ***
+#-
+VIDEO_IVTV all=m sparc=n
+VIDEO_IVTV_ALSA all=m
+VIDEO_FB_IVTV all=m sparc=n
+
+#-
+#- *** FILE: drivers/media/pci/mantis/Kconfig ***
+#-
+MANTIS_CORE all=m
+DVB_MANTIS all=m
+DVB_HOPPER all=m
+
+#-
+#- *** FILE: drivers/media/pci/meye/Kconfig ***
+#-
+VIDEO_MEYE i386=m x86_64=m
+
+#-
+#- *** FILE: drivers/media/pci/ngene/Kconfig ***
+#-
+DVB_NGENE all=m
+
+#-
+#- *** FILE: drivers/media/pci/pluto2/Kconfig ***
+#-
+DVB_PLUTO2 all=m sparc=n
+
+#-
+#- *** FILE: drivers/media/pci/pt1/Kconfig ***
+#-
+DVB_PT1 all=m
+
+#-
+#- *** FILE: drivers/media/pci/saa7134/Kconfig ***
+#-
+VIDEO_SAA7134 all=m sparc=n
+VIDEO_SAA7134_ALSA all=m
+VIDEO_SAA7134_RC all=y
+VIDEO_SAA7134_DVB all=m sparc64=n
+
+#-
+#- *** FILE: drivers/media/pci/saa7146/Kconfig ***
+#-
+VIDEO_HEXIUM_GEMINI all=m
+VIDEO_HEXIUM_ORION all=m
+VIDEO_MXB all=m sparc=n
+
+#-
+#- *** FILE: drivers/media/pci/saa7164/Kconfig ***
+#-
+VIDEO_SAA7164 all=m
+
+#-
+#- *** FILE: drivers/media/pci/ttpci/Kconfig ***
+#-
+DVB_AV7110 all=m sparc=n
+DVB_AV7110_OSD all=y
+DVB_BUDGET_CORE all=m
+DVB_BUDGET all=m sparc=n
+DVB_BUDGET_CI all=m sparc=n
+DVB_BUDGET_AV all=m sparc=n
+DVB_BUDGET_PATCH all=m
+
+#-
+#- *** FILE: drivers/media/pci/zoran/Kconfig ***
+#-
+VIDEO_ZORAN all=m ppc=n sparc=n
+VIDEO_ZORAN_DC30 all=m
+VIDEO_ZORAN_ZR36060 all=m
+VIDEO_ZORAN_BUZ all=m
+VIDEO_ZORAN_DC10 all=m
+VIDEO_ZORAN_LML33 all=m
+VIDEO_ZORAN_LML33R10 all=m
+VIDEO_ZORAN_AVS6EYES all=m
+
+#-
+#- *** FILE: drivers/media/platform/Kconfig ***
+#-
+V4L_PLATFORM_DRIVERS all=y
+#- file drivers/media/platform/marvell-ccic/Kconfig goes here
+VIDEO_VIA_CAMERA all=m
+#- file drivers/media/platform/davinci/Kconfig goes here
+#- file drivers/media/platform/omap/Kconfig goes here
+#- file drivers/media/platform/blackfin/Kconfig goes here
+VIDEO_TIMBERDALE all=m
+#- file drivers/media/platform/soc_camera/Kconfig goes here
+#- file drivers/media/platform/s5p-fimc/Kconfig goes here
+#- file drivers/media/platform/s5p-tv/Kconfig goes here
+V4L_MEM2MEM_DRIVERS all=y
+VIDEO_MEM2MEM_DEINTERLACE all=m
+V4L_TEST_DRIVERS all=n
+VIDEO_VIVI all=m
+VIDEO_MEM2MEM_TESTDEV all=m
+
+#-
+#- *** FILE: drivers/media/platform/marvell-ccic/Kconfig ***
+#-
+VIDEO_CAFE_CCIC all=m sparc=n
+
+#-
+#- *** FILE: drivers/media/platform/soc_camera/Kconfig ***
+#-
+SOC_CAMERA all=m
+SOC_CAMERA_PLATFORM all=m
+VIDEO_SH_MOBILE_CEU all=m
 
 #-
 #- *** FILE: drivers/media/radio/Kconfig ***
@@ -2235,6 +2516,9 @@ RADIO_WL128X all=m
 #-
 RC_CORE all=m
 #- file drivers/media/rc/keymaps/Kconfig goes here
+RC_DECODERS all=y
+LIRC all=m
+IR_LIRC_CODEC all=m
 IR_NEC_DECODER all=m
 IR_RC5_DECODER all=m
 IR_RC6_DECODER all=m
@@ -2244,7 +2528,6 @@ IR_RC5_SZ_DECODER all=m
 IR_SANYO_DECODER all=m
 IR_MCE_KBD_DECODER all=m
 RC_DEVICES all=y
-IR_LIRC_CODEC all=m
 RC_ATI_REMOTE all=m
 IR_ENE all=m
 IR_IMON all=m
@@ -2256,6 +2539,7 @@ IR_REDRAT3 all=m
 IR_STREAMZAP all=m
 IR_WINBOND_CIR all=m
 IR_IGUANA all=m
+IR_TTUSBIR all=m
 RC_LOOPBACK all=m
 IR_GPIO_CIR all=m
 
@@ -2263,154 +2547,64 @@ IR_GPIO_CIR all=m
 #- *** FILE: drivers/media/rc/keymaps/Kconfig ***
 #-
 RC_MAP all=m
-RC_DECODERS all=y
-LIRC all=m
 
 #-
-#- *** FILE: drivers/media/video/Kconfig ***
+#- *** FILE: drivers/media/tuners/Kconfig ***
 #-
-VIDEO_V4L2 all=m
-VIDEO_BTCX all=m sparc=
-VIDEO_TVEEPROM all=m
-VIDEO_TUNER all=m sparc=
-VIDEOBUF2_CORE all=m
-VIDEOBUF2_MEMOPS all=m
-VIDEOBUF2_VMALLOC all=m
-VIDEO_CAPTURE_DRIVERS all=y
-VIDEO_ADV_DEBUG all=n
-VIDEO_FIXED_MINOR_RANGES all=n
-VIDEO_HELPER_CHIPS_AUTO all=y
-#- Audio decoders, processors and mixers
-VIDEO_TVAUDIO all=m
-VIDEO_TDA7432 all=m
-VIDEO_TDA9840 all=m
-VIDEO_TEA6415C all=m
-VIDEO_TEA6420 all=m
-VIDEO_MSP3400 all=m
-VIDEO_CS53L32A all=m
-VIDEO_WM8775 all=m
-VIDEO_WM8739 all=m
-VIDEO_VP27SMPX ia64=m
-#- RDS decoders
-VIDEO_SAA6588 all=m
-#- Video decoders
-VIDEO_BT819 all=m
-VIDEO_BT856 all=m
-VIDEO_KS0127 all=m
-VIDEO_SAA7110 all=m
-VIDEO_SAA711X all=m
-VIDEO_TVP5150 all=m
-VIDEO_VPX3220 all=m
-#- Video and audio decoders
-#- file drivers/media/video/cx25840/Kconfig goes here
-#- MPEG video encoders
-VIDEO_CX2341X all=m
-#- Video encoders
-VIDEO_SAA7127 all=m
-VIDEO_SAA7185 all=m
-VIDEO_ADV7170 all=m
-VIDEO_ADV7175 all=m
-#- Camera sensor devices
-VIDEO_OV7670 all=m
-VIDEO_SR030PC30 all=m
-VIDEO_NOON010PC30 all=m
-#- file drivers/media/video/m5mols/Kconfig goes here
-#- file drivers/media/video/smiapp/Kconfig goes here
-#- Flash devices
-#- Video improvement chips
-VIDEO_UPD64031A all=m
-VIDEO_UPD64083 all=m
-#- Miscelaneous helper chips
-VIDEO_VIVI all=m
-V4L_USB_DRIVERS all=y sparc=n
-#- file drivers/media/video/au0828/Kconfig goes here
-#- file drivers/media/video/uvc/Kconfig goes here
-#- file drivers/media/video/gspca/Kconfig goes here
-#- file drivers/media/video/pvrusb2/Kconfig goes here
-#- file drivers/media/video/hdpvr/Kconfig goes here
-#- file drivers/media/video/em28xx/Kconfig goes here
-#- file drivers/media/video/tlg2300/Kconfig goes here
-#- file drivers/media/video/cx231xx/Kconfig goes here
-#- file drivers/media/video/tm6000/Kconfig goes here
-#- file drivers/media/video/usbvision/Kconfig goes here
-#- file drivers/media/video/sn9c102/Kconfig goes here
-#- file drivers/media/video/pwc/Kconfig goes here
-#- file drivers/media/video/cpia2/Kconfig goes here
-USB_ZR364XX all=m
-USB_STKWEBCAM all=m
-USB_S2255 all=m
-V4L_PCI_DRIVERS all=y
-#- file drivers/media/video/bt8xx/Kconfig goes here
-#- file drivers/media/video/cx18/Kconfig goes here
-#- file drivers/media/video/cx23885/Kconfig goes here
-#- file drivers/media/video/cx25821/Kconfig goes here
-#- file drivers/media/video/cx88/Kconfig goes here
-VIDEO_HEXIUM_GEMINI all=m
-VIDEO_HEXIUM_ORION all=m
-#- file drivers/media/video/ivtv/Kconfig goes here
-VIDEO_MEYE i386=m x86_64=m
-VIDEO_MXB all=m sparc=n
-#- file drivers/media/video/saa7134/Kconfig goes here
-#- file drivers/media/video/saa7164/Kconfig goes here
-#- file drivers/media/video/zoran/Kconfig goes here
-V4L_ISA_PARPORT_DRIVERS all=y
-VIDEO_BWQCAM all=m
-VIDEO_CQCAM all=m
-VIDEO_PMS all=m
-VIDEO_W9966 all=m
-V4L_PLATFORM_DRIVERS all=y
-#- file drivers/media/video/marvell-ccic/Kconfig goes here
-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
-SOC_CAMERA_MT9M001 all=m
-SOC_CAMERA_MT9M111 all=m
-SOC_CAMERA_MT9T031 all=m
-SOC_CAMERA_MT9T112 all=m
-SOC_CAMERA_MT9V022 all=m
-SOC_CAMERA_RJ54N1 all=m
-SOC_CAMERA_TW9910 all=m
-SOC_CAMERA_PLATFORM all=m
-SOC_CAMERA_OV2640 all=m
-SOC_CAMERA_OV5642 all=m
-SOC_CAMERA_OV6650 all=m
-SOC_CAMERA_OV772X all=m
-SOC_CAMERA_OV9640 all=m
-SOC_CAMERA_OV9740 all=m
-VIDEO_SH_MOBILE_CEU all=m
-#- file drivers/media/video/s5p-fimc/Kconfig goes here
-#- file drivers/media/video/s5p-tv/Kconfig goes here
-V4L_MEM2MEM_DRIVERS all=y
-VIDEO_MEM2MEM_TESTDEV all=m
+MEDIA_ATTACH all=y
+MEDIA_TUNER_TDA18212 all=m
 
 #-
-#- *** FILE: drivers/media/video/au0828/Kconfig ***
+#- *** FILE: drivers/media/usb/Kconfig ***
+#-
+MEDIA_USB_SUPPORT all=y
+#- Webcam devices
+#- file drivers/media/usb/uvc/Kconfig goes here
+#- file drivers/media/usb/gspca/Kconfig goes here
+#- file drivers/media/usb/pwc/Kconfig goes here
+#- file drivers/media/usb/cpia2/Kconfig goes here
+#- file drivers/media/usb/zr364xx/Kconfig goes here
+#- file drivers/media/usb/stkwebcam/Kconfig goes here
+#- file drivers/media/usb/s2255/Kconfig goes here
+#- file drivers/media/usb/sn9c102/Kconfig goes here
+#- Analog TV USB devices
+#- file drivers/media/usb/au0828/Kconfig goes here
+#- file drivers/media/usb/pvrusb2/Kconfig goes here
+#- file drivers/media/usb/hdpvr/Kconfig goes here
+#- file drivers/media/usb/tlg2300/Kconfig goes here
+#- file drivers/media/usb/usbvision/Kconfig goes here
+#- file drivers/media/usb/stk1160/Kconfig goes here
+#- Analog/digital TV USB devices
+#- file drivers/media/usb/cx231xx/Kconfig goes here
+#- file drivers/media/usb/tm6000/Kconfig goes here
+#- Digital TV USB devices
+#- file drivers/media/usb/dvb-usb/Kconfig goes here
+#- file drivers/media/usb/dvb-usb-v2/Kconfig goes here
+#- file drivers/media/usb/ttusb-budget/Kconfig goes here
+#- file drivers/media/usb/ttusb-dec/Kconfig goes here
+#- file drivers/media/usb/siano/Kconfig goes here
+#- file drivers/media/usb/b2c2/Kconfig goes here
+#- Webcam, TV (analog/digital) USB devices
+#- file drivers/media/usb/em28xx/Kconfig goes here
+
+#-
+#- *** FILE: drivers/media/usb/au0828/Kconfig ***
 #-
 VIDEO_AU0828 all=m sparc=n
 
 #-
-#- *** FILE: drivers/media/video/bt8xx/Kconfig ***
+#- *** FILE: drivers/media/usb/b2c2/Kconfig ***
 #-
-VIDEO_BT848 all=m sparc=n
-VIDEO_BT848_DVB all=y
+DVB_B2C2_FLEXCOP_USB alpha=m ia64=m i386=m ppc=m ppc64=m sparc64=m x86_64=m
+DVB_B2C2_FLEXCOP_USB_DEBUG all=n
 
 #-
-#- *** FILE: drivers/media/video/cpia2/Kconfig ***
+#- *** FILE: drivers/media/usb/cpia2/Kconfig ***
 #-
 VIDEO_CPIA2 all=m
 
 #-
-#- *** FILE: drivers/media/video/cx18/Kconfig ***
-#-
-VIDEO_CX18 all=m sparc=n
-VIDEO_CX18_ALSA all=m
-
-#-
-#- *** FILE: drivers/media/video/cx231xx/Kconfig ***
+#- *** FILE: drivers/media/usb/cx231xx/Kconfig ***
 #-
 VIDEO_CX231XX all=m
 VIDEO_CX231XX_RC all=y
@@ -2418,33 +2612,55 @@ VIDEO_CX231XX_ALSA all=m
 VIDEO_CX231XX_DVB all=m
 
 #-
-#- *** FILE: drivers/media/video/cx23885/Kconfig ***
-#-
-VIDEO_CX23885 all=m sparc=n
-MEDIA_ALTERA_CI all=m
-
-#-
-#- *** FILE: drivers/media/video/cx25821/Kconfig ***
-#-
-VIDEO_CX25821 all=m
-VIDEO_CX25821_ALSA all=m
-
-#-
-#- *** FILE: drivers/media/video/cx25840/Kconfig ***
+#- *** FILE: drivers/media/usb/dvb-usb-v2/Kconfig ***
 #-
-VIDEO_CX25840 all=m
+DVB_USB_V2 all=m
+DVB_USB_AF9015 all=m
+DVB_USB_AF9035 all=m
+DVB_USB_ANYSEE all=m
+DVB_USB_AU6610 all=m
+DVB_USB_AZ6007 all=m
+DVB_USB_CE6230 all=m
+DVB_USB_EC168 all=m
+DVB_USB_GL861 all=m
+DVB_USB_IT913X all=m
+DVB_USB_LME2510 all=m
+DVB_USB_MXL111SF all=m
+DVB_USB_RTL28XXU all=m
 
 #-
-#- *** FILE: drivers/media/video/cx88/Kconfig ***
+#- *** FILE: drivers/media/usb/dvb-usb/Kconfig ***
 #-
-VIDEO_CX88 all=m sparc=n
-VIDEO_CX88_ALSA all=m
-VIDEO_CX88_BLACKBIRD all=m
-VIDEO_CX88_DVB all=m sparc64=n
-VIDEO_CX88_VP3054 all=m
+DVB_USB all=m
+DVB_USB_DEBUG all=n
+DVB_USB_A800 all=m
+DVB_USB_DIBUSB_MB all=m
+DVB_USB_DIBUSB_MB_FAULTY all=n
+DVB_USB_DIBUSB_MC all=m
+DVB_USB_DIB0700 all=m
+DVB_USB_UMT_010 all=m
+DVB_USB_CXUSB all=m
+DVB_USB_M920X all=m
+DVB_USB_DIGITV all=m
+DVB_USB_VP7045 all=m
+DVB_USB_VP702X all=m
+DVB_USB_GP8PSK all=m
+DVB_USB_NOVA_T_USB2 all=m
+DVB_USB_TTUSB2 all=m
+DVB_USB_DTT200U all=m
+DVB_USB_OPERA1 all=m
+DVB_USB_AF9005 all=m
+DVB_USB_AF9005_REMOTE all=m
+DVB_USB_PCTV452E all=m
+DVB_USB_DW2102 all=m
+DVB_USB_CINERGY_T2 all=m
+DVB_USB_DTV5100 all=m
+DVB_USB_FRIIO all=m
+DVB_USB_AZ6027 all=m
+DVB_USB_TECHNISAT_USB2 all=m
 
 #-
-#- *** FILE: drivers/media/video/em28xx/Kconfig ***
+#- *** FILE: drivers/media/usb/em28xx/Kconfig ***
 #-
 VIDEO_EM28XX all=m
 VIDEO_EM28XX_ALSA all=m sparc=n
@@ -2452,12 +2668,12 @@ VIDEO_EM28XX_DVB all=m sparc=n
 VIDEO_EM28XX_RC all=y
 
 #-
-#- *** FILE: drivers/media/video/gspca/Kconfig ***
+#- *** FILE: drivers/media/usb/gspca/Kconfig ***
 #-
 USB_GSPCA all=m
-#- file drivers/media/video/gspca/m5602/Kconfig goes here
-#- file drivers/media/video/gspca/stv06xx/Kconfig goes here
-#- file drivers/media/video/gspca/gl860/Kconfig goes here
+#- file drivers/media/usb/gspca/m5602/Kconfig goes here
+#- file drivers/media/usb/gspca/stv06xx/Kconfig goes here
+#- file drivers/media/usb/gspca/gl860/Kconfig goes here
 USB_GSPCA_BENQ all=m
 USB_GSPCA_CONEX all=m
 USB_GSPCA_CPIA1 all=m
@@ -2503,43 +2719,27 @@ USB_GSPCA_XIRLINK_CIT all=m
 USB_GSPCA_ZC3XX all=m
 
 #-
-#- *** FILE: drivers/media/video/gspca/gl860/Kconfig ***
+#- *** FILE: drivers/media/usb/gspca/gl860/Kconfig ***
 #-
 USB_GL860 all=m
 
 #-
-#- *** FILE: drivers/media/video/gspca/m5602/Kconfig ***
+#- *** FILE: drivers/media/usb/gspca/m5602/Kconfig ***
 #-
 USB_M5602 all=m
 
 #-
-#- *** FILE: drivers/media/video/gspca/stv06xx/Kconfig ***
+#- *** FILE: drivers/media/usb/gspca/stv06xx/Kconfig ***
 #-
 USB_STV06XX all=m
 
 #-
-#- *** FILE: drivers/media/video/hdpvr/Kconfig ***
+#- *** FILE: drivers/media/usb/hdpvr/Kconfig ***
 #-
 VIDEO_HDPVR all=m
 
 #-
-#- *** FILE: drivers/media/video/ivtv/Kconfig ***
-#-
-VIDEO_IVTV all=m sparc=n
-VIDEO_FB_IVTV all=m sparc=n
-
-#-
-#- *** FILE: drivers/media/video/m5mols/Kconfig ***
-#-
-VIDEO_M5MOLS all=m
-
-#-
-#- *** FILE: drivers/media/video/marvell-ccic/Kconfig ***
-#-
-VIDEO_CAFE_CCIC all=m sparc=n
-
-#-
-#- *** FILE: drivers/media/video/pvrusb2/Kconfig ***
+#- *** FILE: drivers/media/usb/pvrusb2/Kconfig ***
 #-
 VIDEO_PVRUSB2 all=m sparc=n
 VIDEO_PVRUSB2_SYSFS all=y sparc=n
@@ -2547,64 +2747,86 @@ VIDEO_PVRUSB2_DVB all=y sparc=n
 VIDEO_PVRUSB2_DEBUGIFC all=n
 
 #-
-#- *** FILE: drivers/media/video/pwc/Kconfig ***
+#- *** FILE: drivers/media/usb/pwc/Kconfig ***
 #-
 USB_PWC all=m
 USB_PWC_DEBUG all=n
 USB_PWC_INPUT_EVDEV all=y
 
 #-
-#- *** FILE: drivers/media/video/saa7134/Kconfig ***
+#- *** FILE: drivers/media/usb/s2255/Kconfig ***
 #-
-VIDEO_SAA7134 all=m sparc=n
-VIDEO_SAA7134_ALSA all=m
-VIDEO_SAA7134_RC all=y
-VIDEO_SAA7134_DVB all=m sparc64=n
+USB_S2255 all=m
 
 #-
-#- *** FILE: drivers/media/video/saa7164/Kconfig ***
+#- *** FILE: drivers/media/usb/siano/Kconfig ***
 #-
-VIDEO_SAA7164 all=m
+SMS_USB_DRV all=m
 
 #-
-#- *** FILE: drivers/media/video/sn9c102/Kconfig ***
+#- *** FILE: drivers/media/usb/sn9c102/Kconfig ***
 #-
 USB_SN9C102 all=m
 
 #-
-#- *** FILE: drivers/media/video/tlg2300/Kconfig ***
+#- *** FILE: drivers/media/usb/stk1160/Kconfig ***
+#-
+VIDEO_STK1160 all=m
+VIDEO_STK1160_AC97 all=y
+
+#-
+#- *** FILE: drivers/media/usb/stkwebcam/Kconfig ***
+#-
+USB_STKWEBCAM all=m
+
+#-
+#- *** FILE: drivers/media/usb/tlg2300/Kconfig ***
 #-
 VIDEO_TLG2300 all=m
 
 #-
-#- *** FILE: drivers/media/video/tm6000/Kconfig ***
+#- *** FILE: drivers/media/usb/tm6000/Kconfig ***
 #-
 VIDEO_TM6000 all=m
 VIDEO_TM6000_ALSA all=m
 VIDEO_TM6000_DVB all=m
 
 #-
-#- *** FILE: drivers/media/video/usbvision/Kconfig ***
+#- *** FILE: drivers/media/usb/ttusb-budget/Kconfig ***
+#-
+DVB_TTUSB_BUDGET all=m
+
+#-
+#- *** FILE: drivers/media/usb/ttusb-dec/Kconfig ***
+#-
+DVB_TTUSB_DEC all=m
+
+#-
+#- *** FILE: drivers/media/usb/usbvision/Kconfig ***
 #-
 VIDEO_USBVISION all=m
 
 #-
-#- *** FILE: drivers/media/video/uvc/Kconfig ***
+#- *** FILE: drivers/media/usb/uvc/Kconfig ***
 #-
 USB_VIDEO_CLASS all=m sparc=n
 USB_VIDEO_CLASS_INPUT_EVDEV all=y sparc=n
 
 #-
-#- *** FILE: drivers/media/video/zoran/Kconfig ***
+#- *** FILE: drivers/media/usb/zr364xx/Kconfig ***
 #-
-VIDEO_ZORAN all=m ppc=n sparc=n
-VIDEO_ZORAN_DC30 all=m
-VIDEO_ZORAN_ZR36060 all=m
-VIDEO_ZORAN_BUZ all=m
-VIDEO_ZORAN_DC10 all=m
-VIDEO_ZORAN_LML33 all=m
-VIDEO_ZORAN_LML33R10 all=m
-VIDEO_ZORAN_AVS6EYES all=m
+USB_ZR364XX all=m
+
+#-
+#- *** FILE: drivers/media/v4l2-core/Kconfig ***
+#-
+VIDEO_V4L2 all=m
+VIDEO_ADV_DEBUG all=n
+VIDEO_FIXED_MINOR_RANGES all=n
+VIDEO_TUNER all=m sparc=
+VIDEOBUF2_CORE all=m
+VIDEOBUF2_MEMOPS all=m
+VIDEOBUF2_VMALLOC all=m
 
 #-
 #- *** FILE: drivers/memory/Kconfig ***
@@ -2633,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 ***
@@ -2665,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
@@ -2682,7 +2907,6 @@ MFD_DA9052_SPI all=y
 MFD_ARIZONA_I2C all=m
 MFD_ARIZONA_SPI all=m
 MFD_WM5102 all=y
-WM5102 all=y
 MFD_WM5110 all=y
 MFD_WM8400 all=m
 MFD_WM831X all=y
@@ -2711,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 ***
@@ -2752,7 +2978,6 @@ USB_SWITCH_FSA9480 all=m
 #- file drivers/misc/c2port/Kconfig goes here
 #- file drivers/misc/eeprom/Kconfig goes here
 #- file drivers/misc/cb710/Kconfig goes here
-#- file drivers/misc/iwmc3200top/Kconfig goes here
 #- file drivers/misc/ti-st/Kconfig goes here
 #- file drivers/misc/lis3lv02d/Kconfig goes here
 #- file drivers/misc/carma/Kconfig goes here
@@ -2787,13 +3012,6 @@ EEPROM_MAX6875 all=m
 EEPROM_93CX6 all=m
 EEPROM_93XX46 all=m
 
-#-
-#- *** FILE: drivers/misc/iwmc3200top/Kconfig ***
-#-
-IWMC3200TOP all=m
-IWMC3200TOP_DEBUG all=n
-IWMC3200TOP_DEBUGFS all=n
-
 #-
 #- *** FILE: drivers/misc/lis3lv02d/Kconfig ***
 #-
@@ -2842,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
@@ -2851,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 ***
@@ -2986,11 +3206,11 @@ MTD_LATCH_ADDR all=m
 #-
 MTD_NAND_ECC_SMC all=y
 MTD_NAND all=m
-MTD_NAND_VERIFY_WRITE all=y
 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
@@ -3022,7 +3242,8 @@ MTD_ONENAND_SIM all=m
 #-
 MTD_UBI all=m sparc=n
 MTD_UBI_WL_THRESHOLD all=4096
-MTD_UBI_BEB_RESERVE all=1
+MTD_UBI_BEB_LIMIT all=20
+MTD_UBI_FASTMAP all=n
 MTD_UBI_GLUEBI all=n powerpc=m
 
 #-
@@ -3034,11 +3255,11 @@ DUMMY all=m
 EQUALIZER all=m
 NET_FC all=y
 MII all=m
-#- file drivers/ieee802154/Kconfig goes here
 IFB all=m
 #- file drivers/net/team/Kconfig goes here
 MACVLAN all=m
 MACVTAP all=m
+VXLAN all=m
 NETCONSOLE all=m
 NETCONSOLE_DYNAMIC all=y
 NETPOLL_TRAP all=y
@@ -3065,6 +3286,7 @@ NET_SB1000 all=m
 #- file drivers/net/wireless/Kconfig goes here
 #- file drivers/net/wimax/Kconfig goes here
 #- file drivers/net/wan/Kconfig goes here
+#- file drivers/net/ieee802154/Kconfig goes here
 XEN_NETDEV_FRONTEND all=m
 XEN_NETDEV_BACKEND all=m
 VMXNET3 all=m
@@ -3167,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
 
 #-
@@ -3342,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 ***
 #-
@@ -3472,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
 
 #-
@@ -3487,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
@@ -3554,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 ***
@@ -3751,6 +3979,15 @@ ROADRUNNER_LARGE_RINGS all=n
 #-
 HYPERV_NET all=m
 
+#-
+#- *** FILE: drivers/net/ieee802154/Kconfig ***
+#-
+IEEE802154_DRIVERS all=m
+IEEE802154_FAKEHARD all=m
+IEEE802154_FAKELB all=m
+IEEE802154_AT86RF230 all=m
+IEEE802154_MRF24J40 all=m
+
 #-
 #- *** FILE: drivers/net/irda/Kconfig ***
 #-
@@ -3788,6 +4025,7 @@ MCS_FIR all=m
 #-
 PHYLIB all=y
 #- MII PHY device drivers
+AT803X_PHY all=m
 AMD_PHY all=m
 MARVELL_PHY all=m
 DAVICOM_PHY all=m
@@ -3797,8 +4035,8 @@ CICADA_PHY all=m
 VITESSE_PHY all=m
 SMSC_PHY all=m
 BROADCOM_PHY all=m
-BCM87XX_PHY all=m
 BCM63XX_PHY all=m
+BCM87XX_PHY all=m
 ICPLUS_PHY all=m
 REALTEK_PHY all=m
 NATIONAL_PHY all=m
@@ -3862,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
@@ -3928,10 +4167,7 @@ SBNI_MULTILINE i386=y x86_64=y
 #- *** FILE: drivers/net/wimax/i2400m/Kconfig ***
 #-
 #- Enable USB support to see WiMAX USB drivers
-#- Enable MMC support to see WiMAX SDIO drivers
 WIMAX_I2400M_USB all=m
-WIMAX_I2400M_SDIO all=m
-WIMAX_IWMC3200_SDIO all=y
 WIMAX_I2400M_DEBUG_LEVEL all=8
 
 #-
@@ -3964,7 +4200,6 @@ MWL8K all=m
 #- file drivers/net/wireless/ipw2x00/Kconfig goes here
 #- file drivers/net/wireless/iwlwifi/Kconfig goes here
 #- file drivers/net/wireless/iwlegacy/Kconfig goes here
-#- file drivers/net/wireless/iwmc3200wifi/Kconfig goes here
 #- file drivers/net/wireless/libertas/Kconfig goes here
 #- file drivers/net/wireless/orinoco/Kconfig goes here
 #- file drivers/net/wireless/p54/Kconfig goes here
@@ -3978,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 ***
@@ -4018,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 ***
 #-
@@ -4045,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
 
 #-
@@ -4087,14 +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/iwmc3200wifi/Kconfig ***
-#-
-IWM all=m
-IWM_DEBUG all=n
-IWM_TRACING all=n
 
 #-
 #- *** FILE: drivers/net/wireless/libertas/Kconfig ***
@@ -4172,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
@@ -4182,6 +4428,7 @@ RTL8192C_COMMON all=m
 WL_TI all=y
 #- file drivers/net/wireless/ti/wl1251/Kconfig goes here
 #- file drivers/net/wireless/ti/wl12xx/Kconfig goes here
+#- file drivers/net/wireless/ti/wl18xx/Kconfig goes here
 #- file drivers/net/wireless/ti/wlcore/Kconfig goes here
 
 #-
@@ -4195,6 +4442,10 @@ WL1251_SDIO all=m
 #- *** FILE: drivers/net/wireless/ti/wl12xx/Kconfig ***
 #-
 WL12XX all=m
+
+#-
+#- *** FILE: drivers/net/wireless/ti/wl18xx/Kconfig ***
+#-
 WL18XX all=m
 
 #-
@@ -4212,7 +4463,6 @@ ZD1211RW_DEBUG all=n
 #-
 #- *** FILE: drivers/nfc/Kconfig ***
 #-
-PN544_NFC all=m
 PN544_HCI_NFC all=m
 NFC_PN533 all=m
 NFC_WILINK all=m
@@ -4261,7 +4511,6 @@ PCI_LABEL all=y
 #- *** FILE: drivers/pci/hotplug/Kconfig ***
 #-
 HOTPLUG_PCI all=m
-HOTPLUG_PCI_FAKE all=m
 HOTPLUG_PCI_COMPAQ i386=m
 HOTPLUG_PCI_COMPAQ_NVRAM i386=y
 HOTPLUG_PCI_IBM i386=m
@@ -4408,6 +4657,7 @@ POWER_SUPPLY all=m i386=y ia64=y x86_64=y
 POWER_SUPPLY_DEBUG all=n
 PDA_POWER all=m
 APM_POWER ppc=m
+GENERIC_ADC_BATTERY all=m
 WM831X_BACKUP all=m
 WM831X_POWER all=m
 WM8350_POWER all=m
@@ -4422,6 +4672,7 @@ BATTERY_BQ27x00 all=m
 BATTERY_BQ27X00_I2C all=y
 BATTERY_BQ27X00_PLATFORM all=y
 BATTERY_DA9030 all=m
+BATTERY_DA9052 all=m
 BATTERY_MAX17040 all=m
 BATTERY_MAX17042 all=m
 CHARGER_PCF50633 all=m
@@ -4431,8 +4682,21 @@ 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
+
+#-
+#- *** FILE: drivers/power/avs/Kconfig ***
+#-
+POWER_AVS all=y
+
+#-
+#- *** FILE: drivers/power/reset/Kconfig ***
+#-
+POWER_RESET all=y
 
 #-
 #- *** FILE: drivers/pps/Kconfig ***
@@ -4454,11 +4718,15 @@ 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
 
+#-
+#- *** FILE: drivers/pwm/Kconfig ***
+#-
+PWM all=y
+
 #-
 #- *** FILE: drivers/rapidio/Kconfig ***
 #-
@@ -4488,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
@@ -4497,6 +4765,7 @@ REGULATOR_AD5398 all=m
 REGULATOR_ARIZONA all=m
 REGULATOR_DA903X all=m
 REGULATOR_DA9052 all=m
+REGULATOR_FAN53555 all=m
 REGULATOR_MC13783 all=m
 REGULATOR_MC13892 all=m
 REGULATOR_ISL6271A all=m
@@ -4504,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
@@ -4524,6 +4795,11 @@ REGULATOR_WM8350 all=m
 REGULATOR_WM8400 all=m
 REGULATOR_WM8994 all=m
 
+#-
+#- *** FILE: drivers/remoteproc/Kconfig ***
+#-
+STE_MODEM_RPROC all=m
+
 #-
 #- *** FILE: drivers/rtc/Kconfig ***
 #-
@@ -4548,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
@@ -4586,6 +4863,7 @@ RTC_DRV_MSM6242 all=m
 RTC_DRV_BQ4802 all=m sparc64=y
 RTC_DRV_RP5C01 all=m
 RTC_DRV_V3020 all=m
+RTC_DRV_DS2404 all=m
 RTC_DRV_WM831X all=m
 RTC_DRV_WM8350 all=m
 RTC_DRV_PCF50633 all=m
@@ -4630,7 +4908,6 @@ SCSI_MULTI_LUN all=y
 SCSI_CONSTANTS all=n
 SCSI_LOGGING all=y
 SCSI_SCAN_ASYNC all=y
-SCSI_WAIT_SCAN all=m
 SCSI_SPI_ATTRS all=m
 SCSI_FC_ATTRS all=m
 SCSI_FC_TGT_ATTRS all=y
@@ -4667,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
@@ -4745,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
@@ -4790,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 ***
 #-
@@ -4832,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 ***
 #-
@@ -4898,6 +5189,7 @@ SPI_LM70_LLP all=m
 SPI_MPC52xx_PSC ppc=m
 SPI_OC_TINY all=m
 SPI_PXA2XX all=m
+SPI_SC18IS602 all=m
 SPI_TOPCLIFF_PCH all=m
 SPI_XCOMM all=m
 SPI_XILINX all=m
@@ -4916,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 ***
@@ -4935,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
@@ -4951,7 +5243,7 @@ STAGING all=y
 #- 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
+#- file drivers/staging/sm7xxfb/Kconfig goes here
 #- file drivers/staging/crystalhd/Kconfig goes here
 #- file drivers/staging/cxt1e1/Kconfig goes here
 #- file drivers/staging/xgifb/Kconfig goes here
@@ -4969,12 +5261,18 @@ 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/ramster/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
+#- file drivers/staging/ramster/Kconfig goes here
+#- file drivers/staging/silicom/Kconfig goes here
+#- 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 ***
@@ -4991,22 +5289,25 @@ ASUS_OLED all=m
 #-
 BCM_WIMAX all=m
 
+#-
+#- *** FILE: drivers/staging/ced1401/Kconfig ***
+#-
+CED1401 all=m
+
 #-
 #- *** FILE: drivers/staging/comedi/Kconfig ***
 #-
 COMEDI all=m ppc=n
-COMEDI_MISC_DRIVERS all=y
 COMEDI_DEBUG all=n
 COMEDI_DEFAULT_BUF_SIZE_KB all=2048
 COMEDI_DEFAULT_BUF_MAXSIZE_KB all=20480
+COMEDI_MISC_DRIVERS all=y
 COMEDI_KCOMEDILIB all=m
 COMEDI_BOND all=m
 COMEDI_TEST all=m
 COMEDI_PARPORT all=m
 COMEDI_SERIAL2002 all=m
 COMEDI_SKEL all=m
-COMEDI_PCI_DRIVERS all=y
-COMEDI_ISA_DRIVERS all=m
 COMEDI_ACL7225B i386=m
 COMEDI_PCL711 i386=m
 COMEDI_PCL724 i386=m
@@ -5048,23 +5349,21 @@ COMEDI_PCMMIO i386=m
 COMEDI_PCMUIO i386=m
 COMEDI_MULTIQ3 i386=m
 COMEDI_POC i386=m
+COMEDI_PCI_DRIVERS all=y
+COMEDI_8255_PCI all=m
 COMEDI_ADDI_APCI_035 all=m
 COMEDI_ADDI_APCI_1032 all=m
 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
 COMEDI_ADL_PCI6208 all=m
-COMEDI_ADL_PCI7230 all=m
-COMEDI_ADL_PCI7296 all=m
-COMEDI_ADL_PCI7432 all=m
+COMEDI_ADL_PCI7X3X all=m
 COMEDI_ADL_PCI8164 all=m
 COMEDI_ADL_PCI9111 all=m
 COMEDI_ADL_PCI9118 all=m
@@ -5073,6 +5372,7 @@ COMEDI_ADV_PCI1723 all=m
 COMEDI_ADV_PCI_DIO all=m
 COMEDI_AMPLC_DIO200_PCI all=m
 COMEDI_AMPLC_PC236_PCI all=m
+COMEDI_AMPLC_PC263_PCI all=m
 COMEDI_AMPLC_PCI224 all=m
 COMEDI_AMPLC_PCI230 all=m
 COMEDI_CONTEC_PCI_DIO all=m
@@ -5089,7 +5389,6 @@ COMEDI_KE_COUNTER all=m
 COMEDI_CB_PCIDAS64 all=m
 COMEDI_CB_PCIDAS all=m
 COMEDI_CB_PCIDDA all=m
-COMEDI_CB_PCIDIO all=m
 COMEDI_CB_PCIMDAS all=m
 COMEDI_CB_PCIMDDA all=m
 COMEDI_ME4000 all=m
@@ -5098,12 +5397,14 @@ COMEDI_NI_6527 all=m
 COMEDI_NI_65XX all=m
 COMEDI_NI_660X all=m
 COMEDI_NI_670X all=m
+COMEDI_NI_LABPC all=m
 COMEDI_NI_PCIDIO all=m
 COMEDI_NI_PCIMIO all=m
 COMEDI_RTD520 all=m
 COMEDI_S526 all=m
 COMEDI_S626 all=m
 COMEDI_SSV_DNP all=m
+COMEDI_MITE all=m
 COMEDI_PCMCIA_DRIVERS all=y
 COMEDI_CB_DAS16_CS all=m
 COMEDI_DAS08_CS all=m
@@ -5118,13 +5419,9 @@ COMEDI_USBDUX all=m
 COMEDI_USBDUXFAST all=m
 COMEDI_USBDUXSIGMA all=m
 COMEDI_VMK80XX all=m
-COMEDI_NI_COMMON all=m
-COMEDI_MITE all=m
-COMEDI_NI_TIO all=m
-COMEDI_NI_LABPC all=m
 COMEDI_AMPLC_DIO200 all=m
 COMEDI_AMPLC_PC236 all=m
-COMEDI_AMPLC_PC263_PCI all=m
+COMEDI_NI_TIO all=m
 
 #-
 #- *** FILE: drivers/staging/cptm1217/Kconfig ***
@@ -5136,12 +5433,22 @@ TOUCHSCREEN_CLEARPAD_TM1217 all=m
 #-
 CRYSTALHD all=m
 
+#-
+#- *** FILE: drivers/staging/csr/Kconfig ***
+#-
+CSR_WIFI all=m
+
 #-
 #- *** FILE: drivers/staging/cxt1e1/Kconfig ***
 #-
 CXT1E1 all=m
 SBE_PMCC4_NCOMM all=y
 
+#-
+#- *** FILE: drivers/staging/dgrp/Kconfig ***
+#-
+DGRP all=m
+
 #-
 #- *** FILE: drivers/staging/echo/Kconfig ***
 #-
@@ -5164,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 ***
 #-
@@ -5174,7 +5486,6 @@ WIMAX_GDM72XX_WIMAX2 all=y
 WIMAX_GDM72XX_USB all=y
 WIMAX_GDM72XX_SDIO all=n
 WIMAX_GDM72XX_USB_PM all=y
-CSR_WIFI all=m
 
 #-
 #- *** FILE: drivers/staging/iio/Kconfig ***
@@ -5185,7 +5496,6 @@ IIO_SW_RING all=m
 #- file drivers/staging/iio/adc/Kconfig goes here
 #- file drivers/staging/iio/addac/Kconfig goes here
 #- file drivers/staging/iio/cdc/Kconfig goes here
-#- file drivers/staging/iio/dac/Kconfig goes here
 #- file drivers/staging/iio/frequency/Kconfig goes here
 #- file drivers/staging/iio/gyro/Kconfig goes here
 #- file drivers/staging/iio/impedance-analyzer/Kconfig goes here
@@ -5198,7 +5508,6 @@ IIO_SW_RING all=m
 IIO_SIMPLE_DUMMY all=m
 IIO_SIMPLE_DUMMY_EVENTS all=y
 IIO_SIMPLE_DUMMY_BUFFER all=y
-ZSMALLOC all=m
 
 #-
 #- *** FILE: drivers/staging/iio/accel/Kconfig ***
@@ -5219,22 +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
-AD7476 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 ***
@@ -5250,24 +5552,6 @@ AD7150 all=m
 AD7152 all=m
 AD7746 all=m
 
-#-
-#- *** FILE: drivers/staging/iio/dac/Kconfig ***
-#-
-AD5064 all=m
-AD5360 all=m
-AD5380 all=m
-AD5421 all=m
-AD5624R_SPI all=m
-AD5446 all=m
-AD5504 all=m
-AD5764 all=m
-AD5791 all=m
-AD5686 all=m
-MAX517 all=m
-MCP4725 all=m
-
-PWM all=y
-
 #-
 #- *** FILE: drivers/staging/iio/frequency/Kconfig ***
 #-
@@ -5339,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 ***
 #-
@@ -5365,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
 
 #-
@@ -5379,7 +5642,6 @@ STAGING_MEDIA all=y
 #- file drivers/staging/media/as102/Kconfig goes here
 #- file drivers/staging/media/cxd2099/Kconfig goes here
 #- file drivers/staging/media/dt3155v4l/Kconfig goes here
-#- file drivers/staging/media/easycap/Kconfig goes here
 #- file drivers/staging/media/go7007/Kconfig goes here
 #- file drivers/staging/media/solo6x10/Kconfig goes here
 #- file drivers/staging/media/lirc/Kconfig goes here
@@ -5401,12 +5663,6 @@ VIDEO_DT3155 all=m
 DT3155_CCIR all=y
 DT3155_STREAMING all=y
 
-#-
-#- *** FILE: drivers/staging/media/easycap/Kconfig ***
-#-
-EASYCAP all=m
-EASYCAP_DEBUG all=n
-
 #-
 #- *** FILE: drivers/staging/media/go7007/Kconfig ***
 #-
@@ -5433,7 +5689,6 @@ LIRC_SASEM all=m
 LIRC_SERIAL all=m
 LIRC_SERIAL_TRANSMITTER all=y
 LIRC_SIR all=m
-LIRC_TTUSBIR all=m
 LIRC_ZILOG all=m
 
 #-
@@ -5472,6 +5727,11 @@ IDE_PHISON all=m
 #-
 ACPI_QUICKSTART all=m
 
+#-
+#- *** FILE: drivers/staging/ramster/Kconfig ***
+#-
+ZCACHE2 all=y
+
 #-
 #- *** FILE: drivers/staging/rtl8187se/Kconfig ***
 #-
@@ -5508,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 ***
@@ -5528,13 +5787,20 @@ DX_SEP all=m
 #-
 USB_SERIAL_QUATECH2 all=m
 
+#-
+#- *** FILE: drivers/staging/silicom/Kconfig ***
+#-
+NET_VENDOR_SILICOM all=y
+SBYPASS all=m
+BPCTL all=m
+
 #-
 #- *** FILE: drivers/staging/slicoss/Kconfig ***
 #-
 SLICOSS all=m
 
 #-
-#- *** FILE: drivers/staging/sm7xx/Kconfig ***
+#- *** FILE: drivers/staging/sm7xxfb/Kconfig ***
 #-
 FB_SM7XX all=m
 
@@ -5563,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 ***
 #-
@@ -5631,6 +5890,11 @@ ZCACHE all=y
 ZRAM all=m
 ZRAM_DEBUG all=n
 
+#-
+#- *** FILE: drivers/staging/zsmalloc/Kconfig ***
+#-
+ZSMALLOC all=m
+
 #-
 #- *** FILE: drivers/target/Kconfig ***
 #-
@@ -5667,6 +5931,12 @@ 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
 
 #-
 #- *** FILE: drivers/tty/Kconfig ***
@@ -5712,9 +5982,9 @@ HVCS ppc64=n
 #- *** FILE: drivers/tty/serial/8250/Kconfig ***
 #-
 SERIAL_8250 all=y
+SERIAL_8250_PNP all=y
 SERIAL_8250_CONSOLE all=y
 SERIAL_8250_PCI all=y
-SERIAL_8250_PNP all=y
 SERIAL_8250_CS all=m
 SERIAL_8250_NR_UARTS all=8
 SERIAL_8250_RUNTIME_UARTS all=4
@@ -5734,8 +6004,9 @@ SERIAL_8250_RSA all=y
 #-
 #- file drivers/tty/serial/8250/Kconfig goes here
 #- Non-8250 serial port support
+SERIAL_KGDB_NMI all=n
 SERIAL_MAX3100 all=m
-SERIAL_MAX3107 all=m
+SERIAL_MAX310X all=y
 SERIAL_MRST_MAX3110 all=m
 SERIAL_MFD_HSU all=m
 SERIAL_UARTLITE all=m
@@ -5763,6 +6034,7 @@ SERIAL_SGI_IOC4 ia64=m
 SERIAL_SGI_IOC3 ia64=m
 SERIAL_OF_PLATFORM ppc=m ppc64=m
 SERIAL_OF_PLATFORM_NWPSERIAL powerpc=m
+SERIAL_SCCNXP all=m
 SERIAL_TIMBERDALE all=m
 SERIAL_ALTERA_JTAGUART all=m
 SERIAL_ALTERA_UART all=m
@@ -5771,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 ***
@@ -5779,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
@@ -5877,7 +6152,6 @@ USB_NET2280 all=m
 USB_GOKU all=m
 USB_EG20T all=m
 USB_DUMMY_HCD all=m
-USB_GADGET_DUALSPEED all=y
 USB_ZERO all=m
 USB_ZERO_HNPTEST all=n
 USB_AUDIO all=m
@@ -5891,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
@@ -5929,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
@@ -5982,6 +6253,7 @@ USB_IOWARRIOR all=m
 USB_TEST all=m
 USB_ISIGHTFW all=m
 USB_YUREX all=m
+USB_EZUSB_FX2 all=m
 
 #-
 #- *** FILE: drivers/usb/misc/sisusbvga/Kconfig ***
@@ -6013,7 +6285,9 @@ USB_MV_OTG all=m
 #- *** FILE: drivers/usb/phy/Kconfig ***
 #-
 #- USB Physical Layer drivers
+OMAP_USB2 all=m
 USB_ISP1301 all=m
+USB_RCAR_PHY all=m
 
 #-
 #- *** FILE: drivers/usb/renesas_usbhs/Kconfig ***
@@ -6024,7 +6298,6 @@ USB_RENESAS_USBHS all=m
 #- *** FILE: drivers/usb/serial/Kconfig ***
 #-
 USB_SERIAL all=m
-USB_EZUSB all=y
 USB_SERIAL_GENERIC all=y
 USB_SERIAL_AIRCABLE all=m
 USB_SERIAL_ARK3116 all=m
@@ -6088,6 +6361,7 @@ USB_SERIAL_OMNINET all=m
 USB_SERIAL_OPTICON all=m
 USB_SERIAL_VIVOPAY_SERIAL all=m
 USB_SERIAL_ZIO all=m
+USB_SERIAL_ZTE all=m
 USB_SERIAL_SSU100 all=m
 USB_SERIAL_QT2 all=m
 USB_SERIAL_DEBUG all=m
@@ -6114,7 +6388,6 @@ USB_STORAGE_KARMA all=m
 USB_STORAGE_CYPRESS_ATACB all=m
 USB_STORAGE_ENE_UB6250 all=m
 USB_UAS all=m
-USB_LIBUSUAL all=y
 
 #-
 #- *** FILE: drivers/usb/wusbcore/Kconfig ***
@@ -6130,10 +6403,26 @@ UWB all=m
 UWB_WHCI sparc=m
 UWB_I1480U all=m
 
+#-
+#- *** FILE: drivers/vfio/Kconfig ***
+#-
+VFIO all=m
+#- file drivers/vfio/pci/Kconfig goes here
+
+#-
+#- *** FILE: drivers/vfio/pci/Kconfig ***
+#-
+VFIO_PCI all=m
+
 #-
 #- *** FILE: drivers/vhost/Kconfig ***
 #-
 VHOST_NET all=m
+#- file drivers/vhost/Kconfig.tcm goes here
+
+#-
+#- *** FILE: drivers/vhost/Kconfig.tcm ***
+#-
 TCM_VHOST all=m
 
 #-
@@ -6142,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
@@ -6294,7 +6582,6 @@ LCD_AMS369FG06 all=m
 BACKLIGHT_CLASS_DEVICE all=y
 BACKLIGHT_GENERIC all=m
 BACKLIGHT_LM3533 all=m
-BACKLIGHT_PROGEAR i386=m x86_64=m
 BACKLIGHT_CARILLO_RANCH i386=m x86_64=m
 BACKLIGHT_PWM all=m
 BACKLIGHT_DA903X all=m
@@ -6305,8 +6592,11 @@ BACKLIGHT_WM831X all=m
 BACKLIGHT_ADP8860 all=m
 BACKLIGHT_ADP8870 all=m
 BACKLIGHT_PCF50633 all=m
+BACKLIGHT_LM3630 all=m
+BACKLIGHT_LM3639 all=m
 BACKLIGHT_LP855X all=m
 BACKLIGHT_OT200 all=m
+BACKLIGHT_TPS65217 all=m
 
 #-
 #- *** FILE: drivers/video/console/Kconfig ***
@@ -6363,7 +6653,6 @@ VIRT_DRIVERS all=y
 #- *** FILE: drivers/virtio/Kconfig ***
 #-
 VIRTIO all=m
-VIRTIO_RING all=m
 VIRTIO_PCI all=m
 VIRTIO_BALLOON all=m
 VIRTIO_MMIO all=m
@@ -6406,6 +6695,7 @@ W1_MASTER_DS2490 all=m
 W1_MASTER_DS2482 all=m
 W1_MASTER_DS1WM all=m
 W1_MASTER_GPIO all=m
+HDQ_MASTER_OMAP all=m
 
 #-
 #- *** FILE: drivers/w1/slaves/Kconfig ***
@@ -6423,8 +6713,6 @@ W1_SLAVE_DS2781 all=m
 W1_SLAVE_DS28E04 all=m
 W1_SLAVE_BQ27000 all=m
 
-POWER_AVS all=y
-
 #-
 #- *** FILE: drivers/watchdog/Kconfig ***
 #-
@@ -6540,7 +6828,6 @@ FILE_LOCKING all=y
 #- file fs/quota/Kconfig goes here
 #- file fs/autofs4/Kconfig goes here
 #- file fs/fuse/Kconfig goes here
-CUSE all=m
 GENERIC_ACL all=y
 #- file fs/fscache/Kconfig goes here
 #- file fs/cachefiles/Kconfig goes here
@@ -6559,7 +6846,6 @@ MISC_FILESYSTEMS all=y
 #- file fs/adfs/Kconfig goes here
 #- file fs/affs/Kconfig goes here
 #- file fs/ecryptfs/Kconfig goes here
-#- file fs/unionfs/Kconfig goes here
 #- file fs/hfs/Kconfig goes here
 #- file fs/hfsplus/Kconfig goes here
 #- file fs/befs/Kconfig goes here
@@ -6581,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
@@ -6628,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 ***
 #-
@@ -6677,10 +6958,12 @@ CIFS_WEAK_PW_HASH all=y
 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
 CIFS_FSCACHE all=y
-CIFS_ACL all=y
 
 #-
 #- *** FILE: fs/coda/Kconfig ***
@@ -6741,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 ***
 #-
@@ -6773,6 +7063,7 @@ FSCACHE_OBJECT_LIST all=n
 #- *** FILE: fs/fuse/Kconfig ***
 #-
 FUSE_FS all=m
+CUSE all=m
 
 #-
 #- *** FILE: fs/gfs2/Kconfig ***
@@ -7113,26 +7404,32 @@ SWAP all=y
 SYSVIPC all=y
 SYSVIPC_SYSCTL all=y
 POSIX_MQUEUE all=y
-BSD_PROCESS_ACCT all=y
-BSD_PROCESS_ACCT_V3 all=y
 FHANDLE all=y
-TASKSTATS all=y
-TASK_DELAY_ACCT all=y
-TASK_XACCT all=y
-TASK_IO_ACCOUNTING all=y
 AUDIT all=y
 AUDITSYSCALL all=y
 AUDIT_LOGINUID_IMMUTABLE all=n
 #- file kernel/irq/Kconfig goes here
 #- file kernel/time/Kconfig goes here
+TICK_CPU_ACCOUNTING all=n
+IRQ_TIME_ACCOUNTING all=y
+BSD_PROCESS_ACCT all=y
+BSD_PROCESS_ACCT_V3 all=y
+TASKSTATS all=y
+TASK_DELAY_ACCT all=y
+TASK_XACCT all=y
+TASK_IO_ACCOUNTING all=y
 TREE_RCU all=y
+RCU_USER_QS all=n
 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
@@ -7146,10 +7443,6 @@ MEMCG_SWAP all=y
 MEMCG_SWAP_ENABLED all=y
 MEMCG_KMEM all=y
 CGROUP_HUGETLB all=y
-CGROUP_MEM_RES_CTLR all=y
-CGROUP_MEM_RES_CTLR_SWAP all=y
-CGROUP_MEM_RES_CTLR_SWAP_ENABLED all=n
-CGROUP_MEM_RES_CTLR_KMEM all=y
 CGROUP_PERF all=y
 CGROUP_SCHED all=y
 FAIR_GROUP_SCHED all=y
@@ -7210,6 +7503,7 @@ MODULE_UNLOAD all=y
 MODULE_FORCE_UNLOAD all=y
 MODVERSIONS all=n
 MODULE_SRCVERSION_ALL all=n
+MODULE_SIG all=n
 STOP_MACHINE all=y
 #- file block/Kconfig goes here
 #- file kernel/Kconfig.locks goes here
@@ -7406,8 +7700,9 @@ MEMORY_NOTIFIER_ERROR_INJECT all=m
 FAULT_INJECTION all=n
 LATENCYTOP all=n
 #- file mm/Kconfig.debug goes here
-DEBUG_TLBFLUSH all=n
 #- file kernel/trace/Kconfig goes here
+RBTREE_TEST all=m
+INTERVAL_TREE_TEST all=m
 PROVIDE_OHCI1394_DMA_INIT all=n
 FIREWIRE_OHCI_REMOTE_DMA all=n
 BUILD_DOCSRC all=n
@@ -7454,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
@@ -7590,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
 
 #-
@@ -7685,7 +7983,6 @@ CEPH_LIB_USE_DNS_RESOLVER all=y
 #- *** FILE: net/dcb/Kconfig ***
 #-
 DCB all=y
-DNS_RESOLVER all=m
 
 #-
 #- *** FILE: net/dccp/Kconfig ***
@@ -7715,6 +8012,11 @@ DECNET_ROUTER all=y
 #-
 DECNET_NF_GRABULATOR all=m
 
+#-
+#- *** FILE: net/dns_resolver/Kconfig ***
+#-
+DNS_RESOLVER all=m
+
 #-
 #- *** FILE: net/dsa/Kconfig ***
 #-
@@ -7799,7 +8101,7 @@ IP_NF_MATCH_TTL all=m
 IP_NF_FILTER all=m
 IP_NF_TARGET_REJECT all=m
 IP_NF_TARGET_ULOG all=m
-NF_NAT all=m
+NF_NAT_IPV4 all=m
 IP_NF_TARGET_MASQUERADE all=m
 IP_NF_TARGET_NETMAP all=m
 IP_NF_TARGET_REDIRECT all=m
@@ -7835,6 +8137,7 @@ INET6_XFRM_MODE_ROUTEOPTIMIZATION all=m
 IPV6_SIT all=m
 IPV6_SIT_6RD all=y
 IPV6_TUNNEL all=m
+IPV6_GRE all=m
 IPV6_MULTIPLE_TABLES all=y
 IPV6_SUBTREES all=y
 IPV6_MROUTE all=y
@@ -7861,6 +8164,9 @@ IP6_NF_TARGET_REJECT all=m
 IP6_NF_MANGLE all=m
 IP6_NF_RAW all=m
 IP6_NF_SECURITY all=m
+NF_NAT_IPV6 all=m
+IP6_NF_TARGET_MASQUERADE all=m
+IP6_NF_TARGET_NPT all=m
 
 #-
 #- *** FILE: net/ipx/Kconfig ***
@@ -7973,6 +8279,7 @@ NF_CT_NETLINK all=m
 NF_CT_NETLINK_TIMEOUT all=m
 NF_CT_NETLINK_HELPER all=m
 NETFILTER_NETLINK_QUEUE_CT all=y
+NF_NAT all=m
 NETFILTER_TPROXY all=m
 NETFILTER_XTABLES all=m
 #- Xtables combined modules
@@ -8132,6 +8439,7 @@ OPENVSWITCH all=m
 #- *** FILE: net/packet/Kconfig ***
 #-
 PACKET all=y
+PACKET_DIAG all=m
 
 #-
 #- *** FILE: net/phonet/Kconfig ***
@@ -8230,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 ***
@@ -8241,14 +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_DEBUG all=n
+TIPC_PORTS all=8191
 
 #-
 #- *** FILE: net/unix/Kconfig ***
@@ -8279,7 +8587,6 @@ CFG80211_DEFAULT_PS all=y
 CFG80211_DEBUGFS all=n
 CFG80211_INTERNAL_REGDB all=n
 CFG80211_WEXT all=y
-WIRELESS_EXT_SYSFS all=y
 LIB80211 all=m
 LIB80211_DEBUG all=n
 
@@ -8379,6 +8686,7 @@ SECURITY_TOMOYO_ACTIVATION_TRIGGER all="/sbin/init"
 #- *** FILE: security/yama/Kconfig ***
 #-
 SECURITY_YAMA all=y
+SECURITY_YAMA_STACKED all=y
 
 #-
 #- *** FILE: sound/Kconfig ***
@@ -8468,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
@@ -8486,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 ***
@@ -8661,7 +8970,6 @@ SND_HDA_CODEC_CA0132 all=y
 SND_HDA_CODEC_CMEDIA all=y
 SND_HDA_CODEC_SI3054 all=y
 SND_HDA_GENERIC all=y
-SND_HDA_POWER_SAVE all=y
 SND_HDA_POWER_SAVE_DEFAULT all=300
 
 #-
@@ -8687,8 +8995,9 @@ SND_SOC all=m
 #- file sound/soc/atmel/Kconfig goes here
 #- file sound/soc/au1x/Kconfig goes here
 #- file sound/soc/blackfin/Kconfig goes here
+#- file sound/soc/cirrus/Kconfig goes here
 #- file sound/soc/davinci/Kconfig goes here
-#- file sound/soc/ep93xx/Kconfig goes here
+#- file sound/soc/dwc/Kconfig goes here
 #- file sound/soc/fsl/Kconfig goes here
 #- file sound/soc/jz4740/Kconfig goes here
 #- file sound/soc/nuc900/Kconfig goes here
@@ -8784,23 +9093,44 @@ 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
 BRIQ_PANEL ppc=m
 BT_L2CAP all=y
 BT_SCO all=y
+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
+COMEDI_CB_PCIDIO all=m
+COMEDI_NI_COMMON all=m
 COMPUTONE all=m
 CRYPTO_LZF all=m
 CS5535_GPIO i386=m
 DEBUG_SPINLOCK_SLEEP all=n
 DIGIEPCA all=m
 DISPLAY_SUPPORT all=m
+DM_DEBUG_SPACE_MAPS all=n
+DRM_NOUVEAU_DEBUG all=n
 DRM_PSB all=m
 DRM_PSB_CDV all=y
 DRM_PSB_MFLD all=y
 DRM_PSB_MRST all=y
+DVB_CAPTURE_DRIVERS all=y
+DVB_FE_CUSTOMISE all=n
 EARLY_PRINTK_MRST all=n
+EASYCAP all=m
+EASYCAP_DEBUG all=n
 EASYCAP_OSS all=n
 EASYCAP_SND all=y
 ECONET all=m
@@ -8809,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
@@ -8821,6 +9152,7 @@ HID_ROCCAT_KOVAPLUS all=m
 HID_ROCCAT_PYRA all=m
 HID_SUPPORT all=y
 HID_WACOM_POWER_SUPPLY all=y
+HOTPLUG_PCI_FAKE all=m
 HVC_ISERIES ppc64=n
 HYPERV_BLOCK all=m
 HYPERV_MOUSE all=m
@@ -8838,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
@@ -8847,23 +9180,41 @@ 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
 IWL_P2P all=n
+IWM all=m
+IWMC3200TOP all=m
+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
 MFD_SUPPORT all=y
 MISC_DEVICES all=y
 MMC_SDHCI_OF powerpc=m
 MTD_DEBUG all=n
+MTD_NAND_VERIFY_WRITE all=y
+MTD_UBI_BEB_RESERVE all=1
 MTD_UBI_DEBUG all=n
 MYRI_SBUS sparc=m sparc64=m
 NE2_MCA i386=m
@@ -8879,8 +9230,13 @@ 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
 POHMELFS_DEBUG all=n
@@ -8892,16 +9248,25 @@ 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
 SND_HDA_ENABLE_REALTEK_QUIRKS all=y
+SND_HDA_POWER_SAVE all=y
 SND_INTELMID all=n
 SND_INTEL_SST all=m
 SND_SOC_CACHE_LZO all=y
@@ -8916,6 +9281,8 @@ 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=
 TR all=y sparc=n
@@ -8926,10 +9293,14 @@ USB_CI13XXX_PCI all=m
 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
 USB_GADGET_CI13XXX_PCI all=n
+USB_GADGET_DUALSPEED all=y
 USB_GADGET_DUMMY_HCD all=y
 USB_GADGET_DWC3 all=m
 USB_GADGET_EG20T all=n
@@ -8945,11 +9316,25 @@ USB_GADGET_R8A66597 all=n
 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
+V4L_USB_DRIVERS all=y sparc=n
+VIDEO_BT848_DVB all=y
+VIDEO_CAPTURE_DRIVERS all=y
+VIDEO_HELPER_CHIPS_AUTO all=y
+VIDEO_V4L2_COMMON all=m
+VIRTIO_RING all=m
+WIMAX_I2400M_SDIO all=m
+WIMAX_IWMC3200_SDIO all=y
+WIRELESS_EXT_SYSFS all=y
 WL12XX_HT all=y
 WL12XX_MENU all=m
 WL12XX_SDIO all=m
 WL12XX_SDIO_TEST all=m
 WL12XX_SPI all=m
+WM5102 all=y
 XEN_PLATFORM_PCI all=m
-XVMALLOC all=y
+XVMALLOC all=y