- fix asm syntax

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

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index ae1ede49b0812b22d1827841bfacbfc4bdab058e..7f8be95466c4a4cff92141df691f29c827ea5548 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -6,10 +6,11 @@ AMD_NUMA all=y
 CPU_SUP_AMD all=y
 CPU_SUP_CENTAUR all=y
 CPU_SUP_INTEL all=y
+DEBUG_NMI_SELFTEST all=n
 DEBUG_SET_MODULE_RONX all=y
 DEBUG_STRICT_USER_COPY_CHECKS all=n
 DMI all=y
-EARLY_PRINTK_MRST all=n
+EFI_STUB all=y
 GART_IOMMU all=y
 KEYS_COMPAT all=y
 KVM_MMU_AUDIT all=y
@@ -17,6 +18,7 @@ OPTPROBES all=y
 PHYSICAL_START all=0x1000000
 PROCESSOR_SELECT all=y
 RAPIDIO all=y
+X86_X2APIC all=y
 
 #-
 #- *** FILE: block/Kconfig ***
@@ -27,6 +29,7 @@ BLK_DEV_BSG all=y
 BLK_DEV_BSGLIB all=y
 BLK_DEV_INTEGRITY all=y
 BLK_DEV_THROTTLING all=y
+#- file block/partitions/Kconfig goes here
 #- file block/Kconfig.iosched goes here
 
 #-
@@ -41,6 +44,35 @@ DEFAULT_CFQ all=y
 DEFAULT_NOOP all=n
 DEFAULT_IOSCHED all="cfq"
 
+#-
+#- *** FILE: block/partitions/Kconfig ***
+#-
+PARTITION_ADVANCED all=y
+ACORN_PARTITION all=y
+ACORN_PARTITION_CUMANA all=y
+ACORN_PARTITION_EESOX all=y
+ACORN_PARTITION_ICS all=y
+ACORN_PARTITION_ADFS all=y
+ACORN_PARTITION_POWERTEC all=y
+ACORN_PARTITION_RISCIX all=y
+OSF_PARTITION all=y
+AMIGA_PARTITION all=y
+ATARI_PARTITION all=y
+MAC_PARTITION all=y
+MSDOS_PARTITION all=y
+BSD_DISKLABEL all=y
+MINIX_SUBPARTITION all=y
+SOLARIS_X86_PARTITION all=y
+UNIXWARE_DISKLABEL all=y
+LDM_PARTITION all=y
+LDM_DEBUG all=n
+SGI_PARTITION all=y
+ULTRIX_PARTITION all=y
+SUN_PARTITION all=y
+KARMA_PARTITION all=y
+EFI_PARTITION all=y
+SYSV68_PARTITION all=y
+
 #-
 #- *** FILE: crypto/Kconfig ***
 #-
@@ -53,6 +85,7 @@ CRYPTO_AEAD all=m
 CRYPTO_BLKCIPHER all=m
 CRYPTO_HASH all=y
 CRYPTO_MANAGER all=y
+CRYPTO_USER all=m
 CRYPTO_MANAGER_DISABLE_TESTS all=y
 CRYPTO_GF128MUL all=m
 CRYPTO_NULL all=m
@@ -88,6 +121,7 @@ CRYPTO_RMD160 all=m
 CRYPTO_RMD256 all=m
 CRYPTO_RMD320 all=m
 CRYPTO_SHA1 all=y
+CRYPTO_SHA1_SSSE3 all=m
 CRYPTO_SHA256 all=y
 CRYPTO_SHA512 all=m
 CRYPTO_TGR192 all=m
@@ -101,7 +135,9 @@ CRYPTO_AES_NI_INTEL all=m
 CRYPTO_ANUBIS all=m
 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
@@ -112,11 +148,13 @@ CRYPTO_SALSA20_586 all=m
 CRYPTO_SALSA20_X86_64 x86_64=m
 CRYPTO_SEED all=m
 CRYPTO_SERPENT all=m
+CRYPTO_SERPENT_SSE2_X86_64 all=m
 CRYPTO_TEA all=m
 CRYPTO_TWOFISH all=m
 CRYPTO_TWOFISH_COMMON all=m
 CRYPTO_TWOFISH_586 i386=m
 CRYPTO_TWOFISH_X86_64 x86_64=m
+CRYPTO_TWOFISH_X86_64_3WAY all=m
 #- Compression
 CRYPTO_DEFLATE all=m
 CRYPTO_ZLIB all=m
@@ -165,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
 
 #-
@@ -316,23 +355,22 @@ CFAG12864B_RATE i386=20 x86_64=20
 #-
 #- *** FILE: drivers/base/Kconfig ***
 #-
-UEVENT_HELPER_PATH all="/sbin/hotplug"
+UEVENT_HELPER_PATH all=""
 DEVTMPFS all=y
-DEVTMPFS_MOUNT all=n
+DEVTMPFS_MOUNT all=y
 STANDALONE all=n
 PREVENT_FIRMWARE_BUILD all=y
 FIRMWARE_IN_KERNEL all=n
 EXTRA_FIRMWARE all=""
 DEBUG_DRIVER all=n
 DEBUG_DEVRES all=n
-SYS_HYPERVISOR all=n
 #- file drivers/base/regmap/Kconfig goes here
 
 #-
 #- *** FILE: drivers/bcma/Kconfig ***
 #-
 BCMA_POSSIBLE all=y
-BCMA all=m
+BCMA all=n
 BCMA_HOST_PCI_POSSIBLE all=y
 BCMA_HOST_PCI all=y
 BCMA_DEBUG all=n
@@ -346,6 +384,7 @@ MAC_FLOPPY ppc=m
 BLK_DEV_XD alpha=m i386=m
 PARIDE all=m
 #- file drivers/block/paride/Kconfig goes here
+#- file drivers/block/mtip32xx/Kconfig goes here
 BLK_CPQ_DA all=m sparc64=n
 BLK_CPQ_CISS_DA all=m sparc=n
 CISS_SCSI_TAPE all=y
@@ -357,6 +396,7 @@ BLK_DEV_LOOP_MIN_COUNT all=8
 BLK_DEV_CRYPTOLOOP all=n
 #- file drivers/block/drbd/Kconfig goes here
 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
@@ -370,6 +410,8 @@ CDROM_PKTCDVD_WCACHE all=y
 ATA_OVER_ETH all=m
 SUNVDC sparc64=m
 #- file drivers/s390/block/Kconfig goes here
+XEN_BLKDEV_FRONTEND all=m
+XEN_BLKDEV_BACKEND all=m
 VIRTIO_BLK all=m
 BLK_DEV_HD all=n
 BLK_DEV_RBD all=m
@@ -381,6 +423,11 @@ BLK_DEV_RBD all=m
 BLK_DEV_DRBD all=m
 DRBD_FAULT_INJECTION all=n
 
+#-
+#- *** FILE: drivers/block/mtip32xx/Kconfig ***
+#-
+BLK_DEV_PCIESSD_MTIP32XX all=m
+
 #-
 #- *** FILE: drivers/block/paride/Kconfig ***
 #-
@@ -442,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
@@ -585,6 +631,17 @@ CRYPTO_DEV_HIFN_795X_RNG all=y
 #- file drivers/crypto/caam/Kconfig goes here
 CRYPTO_DEV_TALITOS all=m
 
+#-
+#- *** FILE: drivers/devfreq/Kconfig ***
+#-
+PM_DEVFREQ all=y
+#- DEVFREQ Governors
+DEVFREQ_GOV_SIMPLE_ONDEMAND all=y
+DEVFREQ_GOV_PERFORMANCE all=y
+DEVFREQ_GOV_POWERSAVE all=y
+DEVFREQ_GOV_USERSPACE all=y
+#- DEVFREQ Drivers
+
 #-
 #- *** FILE: drivers/dma/Kconfig ***
 #-
@@ -628,6 +685,7 @@ EDAC_R82600 i386=m
 EDAC_I5000 i386=m x86_64=m
 EDAC_I5100 i386=m x86_64=m
 EDAC_I7300 all=m
+EDAC_SBRIDGE all=m
 EDAC_PASEMI ppc64=m
 EDAC_CELL ppc64=m
 EDAC_AMD8131 powerpc=m
@@ -644,7 +702,7 @@ EISA_NAMES alpha=y i386=y
 #-
 #- *** 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
@@ -657,6 +715,8 @@ EDD i386=m x86_64=m
 EDD_OFF all=n
 FIRMWARE_MEMMAP all=y
 EFI_VARS all=m
+EFI_VARS_PSTORE all=y
+EFI_VARS_PSTORE_DEFAULT_DISABLE all=n
 EFI_PCDP ia64=y
 DELL_RBU i386=m x86_64=m
 DCDBAS i386=m x86_64=m
@@ -664,7 +724,6 @@ DMIID all=y
 DMI_SYSFS all=m
 ISCSI_IBFT_FIND all=y
 ISCSI_IBFT all=m
-SIGMA all=m
 #- file drivers/firmware/google/Kconfig goes here
 
 #-
@@ -692,6 +751,7 @@ GPIO_MAX732X all=m
 GPIO_PCA953X all=m
 GPIO_PCF857X all=m
 GPIO_SX150X all=m
+GPIO_STMPE all=y
 GPIO_TPS65912 all=m
 GPIO_TWL4030 powerpc=m
 GPIO_WM831X all=m
@@ -719,10 +779,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
@@ -730,6 +792,17 @@ DRM_MGA all=m
 DRM_SIS all=m
 DRM_VIA all=m
 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 ***
+#-
+DRM_GMA500 all=m
+DRM_GMA600 all=y
+DRM_GMA3600 all=y
 
 #-
 #- *** FILE: drivers/gpu/drm/nouveau/Kconfig ***
@@ -745,6 +818,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 ***
 #-
@@ -771,7 +849,7 @@ HIDRAW all=y
 #- file drivers/hid/usbhid/Kconfig goes here
 HID_A4TECH all=m
 HID_ACRUX all=m
-HID_ACRUX_FF all=m
+HID_ACRUX_FF all=y
 HID_APPLE all=m
 HID_BELKIN all=m
 HID_CHERRY all=m
@@ -794,10 +872,11 @@ HID_TWINHAN all=m
 HID_KENSINGTON all=m
 HID_LCPOWER all=m
 HID_LOGITECH all=m
+HID_LOGITECH_DJ all=m
 LOGITECH_FF all=y
 LOGIRUMBLEPAD2_FF all=y
 LOGIG940_FF all=y
-LOGIWII_FF all=y
+LOGIWHEELS_FF all=y
 HID_MAGICMOUSE all=m
 HID_MICROSOFT all=m
 HID_MONTEREY all=m
@@ -812,27 +891,26 @@ HID_PICOLCD_FB all=y
 HID_PICOLCD_BACKLIGHT all=y
 HID_PICOLCD_LCD all=y
 HID_PICOLCD_LEDS all=y
-HID_QUANTA all=m
+HID_PRIMAX all=m
 HID_ROCCAT all=m
-HID_ROCCAT_COMMON all=m
-HID_ROCCAT_ARVO 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
 HID_SUNPLUS all=m
 HID_GREENASIA all=m
 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
 HID_WACOM all=m
 HID_WACOM_POWER_SUPPLY all=y
+HID_WIIMOTE all=m
+HID_WIIMOTE_EXT all=y
 HID_ZEROPLUS all=m
 ZEROPLUS_FF all=y
 HID_ZYDACRON all=m
@@ -848,6 +926,24 @@ 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 ***
+#-
+HYPERV all=m
+HYPERV_UTILS all=m
+
 #-
 #- *** FILE: drivers/hwmon/Kconfig ***
 #-
@@ -857,6 +953,7 @@ HWMON_DEBUG_CHIP all=n
 #- Native drivers
 SENSORS_ABITUGURU all=m
 SENSORS_ABITUGURU3 all=m
+SENSORS_AD7314 all=m
 SENSORS_AD7414 all=m
 SENSORS_AD7418 all=m
 SENSORS_ADCXX all=m
@@ -919,6 +1016,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
@@ -975,11 +1073,13 @@ PMBUS all=m
 SENSORS_PMBUS all=m
 SENSORS_ADM1275 all=m
 SENSORS_LM25066 all=m
+SENSORS_LTC2978 all=m
 SENSORS_MAX16064 all=m
 SENSORS_MAX34440 all=m
 SENSORS_MAX8688 all=m
 SENSORS_UCD9000 all=m
 SENSORS_UCD9200 all=m
+SENSORS_ZL6100 all=m
 
 #-
 #- *** FILE: drivers/i2c/Kconfig ***
@@ -1031,7 +1131,8 @@ I2C_SCMI all=m
 I2C_HYDRA ppc=m
 I2C_POWERMAC ppc=m ppc64=m
 #- I2C system bus drivers (mostly embedded / system-on-chip)
-I2C_DESIGNWARE powerpc=m
+I2C_DESIGNWARE_PCI all=m
+I2C_EG20T all=m
 I2C_GPIO all=m
 I2C_INTEL_MID all=m
 I2C_MPC ppc=n
@@ -1041,7 +1142,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
@@ -1169,6 +1269,7 @@ INFINIBAND_ADDR_TRANS all=y sparc=
 #- file drivers/infiniband/hw/nes/Kconfig goes here
 #- file drivers/infiniband/ulp/ipoib/Kconfig goes here
 #- file drivers/infiniband/ulp/srp/Kconfig goes here
+#- file drivers/infiniband/ulp/srpt/Kconfig goes here
 #- file drivers/infiniband/ulp/iser/Kconfig goes here
 
 #-
@@ -1232,6 +1333,11 @@ INFINIBAND_ISER all=m sparc=
 #-
 INFINIBAND_SRP all=m sparc=
 
+#-
+#- *** FILE: drivers/infiniband/ulp/srpt/Kconfig ***
+#-
+INFINIBAND_SRPT all=m
+
 #-
 #- *** FILE: drivers/input/Kconfig ***
 #-
@@ -1319,6 +1425,7 @@ KEYBOARD_LKKBD all=m
 KEYBOARD_GPIO all=m
 KEYBOARD_GPIO_POLLED all=m
 KEYBOARD_TCA6416 all=m
+KEYBOARD_TCA8418 all=m
 KEYBOARD_MATRIX all=m
 KEYBOARD_LM8323 all=m
 KEYBOARD_MAX7359 all=m
@@ -1328,6 +1435,8 @@ KEYBOARD_NEWTON all=m
 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
 
@@ -1339,14 +1448,17 @@ INPUT_AB8500_PONKEY all=m
 INPUT_AD714X all=m
 INPUT_AD714X_I2C all=m
 INPUT_AD714X_SPI all=m
+INPUT_BMA150 all=m
 INPUT_PCSPKR all=m
 INPUT_SPARCSPKR sparc64=m
+INPUT_MC13783_PWRBUTTON all=m
 INPUT_MMA8450 all=m
 INPUT_MPU3050 all=m
 INPUT_APANEL all=m
+INPUT_GP2A all=m
+INPUT_GPIO_TILT_POLLED all=m
 INPUT_WISTRON_BTNS i386=m
 INPUT_ATLAS_BTNS i386=m x86_64=m
-INPUT_ATI_REMOTE all=m sparc=n
 INPUT_ATI_REMOTE2 all=m sparc=n
 INPUT_KEYSPAN_REMOTE all=m sparc=n
 INPUT_KXTJ9 all=m
@@ -1359,6 +1471,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
@@ -1366,6 +1479,7 @@ INPUT_ADXL34X_I2C all=m
 INPUT_ADXL34X_SPI all=m
 INPUT_CMA3000 all=m
 INPUT_CMA3000_I2C all=m
+INPUT_XEN_KBDDEV_FRONTEND all=m
 
 #-
 #- *** FILE: drivers/input/mouse/Kconfig ***
@@ -1390,6 +1504,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 ***
@@ -1427,13 +1542,19 @@ TOUCHSCREEN_AD7879 all=m
 TOUCHSCREEN_AD7879_I2C all=m
 TOUCHSCREEN_AD7879_SPI all=m
 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
@@ -1448,6 +1569,7 @@ TOUCHSCREEN_PENMOUNT all=m
 TOUCHSCREEN_TOUCHRIGHT all=m
 TOUCHSCREEN_TOUCHWIN all=m
 TOUCHSCREEN_UCB1400 all=m sparc=n
+TOUCHSCREEN_PIXCIR all=m
 TOUCHSCREEN_WM831X all=m
 TOUCHSCREEN_WM97XX all=m
 TOUCHSCREEN_WM9705 all=y
@@ -1472,17 +1594,23 @@ TOUCHSCREEN_USB_ZYTRONIC all=y
 TOUCHSCREEN_USB_ETT_TC45USB all=y
 TOUCHSCREEN_USB_NEXIO all=y
 TOUCHSCREEN_TOUCHIT213 all=m
+TOUCHSCREEN_TSC_SERIO all=m
 TOUCHSCREEN_TSC2005 all=m
 TOUCHSCREEN_TSC2007 all=m
 TOUCHSCREEN_W90X900 all=m
 TOUCHSCREEN_PCAP all=m
 TOUCHSCREEN_ST1232 all=m
+TOUCHSCREEN_STMPE all=m
 TOUCHSCREEN_TPS6507X all=m
 
 #-
 #- *** FILE: drivers/iommu/Kconfig ***
 #-
 IOMMU_SUPPORT all=y
+AMD_IOMMU_V2 all=m
+INTEL_IOMMU all=y
+INTEL_IOMMU_DEFAULT_ON all=y
+IRQ_REMAP all=y
 
 #-
 #- *** FILE: drivers/isdn/Kconfig ***
@@ -1625,9 +1753,7 @@ LEDS_CLASS all=y
 #- LED drivers
 LEDS_LM3530 all=m
 LEDS_NET48XX i386=m
-LEDS_NET5501 all=m
 LEDS_WRAP i386=m
-LEDS_ALIX2 all=m
 LEDS_SUNFIRE sparc64=m
 LEDS_PCA9532 all=m
 LEDS_PCA9532_GPIO all=y
@@ -1637,6 +1763,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
@@ -1647,6 +1774,8 @@ LEDS_INTEL_SS4200 all=m
 LEDS_LT3593 all=m
 LEDS_DELL_NETBOOKS all=m
 LEDS_MC13783 all=m
+LEDS_TCA6507 all=m
+LEDS_OT200 all=m
 LEDS_TRIGGERS all=y
 #- LED Triggers
 LEDS_TRIGGER_TIMER all=m
@@ -1710,8 +1839,12 @@ MD_MULTIPATH all=m
 MD_FAULTY all=m
 BLK_DEV_DM all=m
 DM_DEBUG all=n
+#- file drivers/md/persistent-data/Kconfig goes here
 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
@@ -1722,6 +1855,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 ***
@@ -1733,6 +1867,7 @@ VIDEO_DEV all=m
 VIDEO_V4L2_COMMON all=m
 VIDEO_V4L2_SUBDEV_API all=y
 DVB_CORE all=m
+DVB_NET all=y
 #- Multimedia drivers
 #- file drivers/media/common/Kconfig goes here
 #- file drivers/media/rc/Kconfig goes here
@@ -1801,6 +1936,11 @@ DVB_B2C2_FLEXCOP_DEBUG all=n
 #-
 DVB_BT8XX all=m
 
+#-
+#- *** FILE: drivers/media/dvb/ddbridge/Kconfig ***
+#-
+DVB_DDBRIDGE all=m
+
 #-
 #- *** FILE: drivers/media/dvb/dm1105/Kconfig ***
 #-
@@ -1831,6 +1971,7 @@ 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
@@ -1839,9 +1980,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 ***
@@ -1963,12 +2108,25 @@ DVB_TTUSB_DEC all=m
 #- *** FILE: drivers/media/radio/Kconfig ***
 #-
 RADIO_ADAPTERS all=y
+RADIO_SI470X all=y
+#- file drivers/media/radio/si470x/Kconfig goes here
+USB_MR800 all=m
+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
+RADIO_TIMBERDALE all=m
+RADIO_WL1273 all=m
+#- file drivers/media/radio/wl128x/Kconfig goes here
 RADIO_CADET alpha=m i386=m
 RADIO_RTRACK alpha=m i386=m
 RADIO_RTRACK2 alpha=m i386=m
 RADIO_AZTECH alpha=m i386=m
 RADIO_GEMTEK alpha=m i386=m
-RADIO_MAXIRADIO all=m
 RADIO_MIROPCM20 all=m
 RADIO_SF16FMI alpha=m i386=m
 RADIO_SF16FMR2 alpha=m i386=m
@@ -1976,18 +2134,6 @@ RADIO_TERRATEC alpha=m i386=m
 RADIO_TRUST alpha=m i386=m
 RADIO_TYPHOON alpha=m i386=m
 RADIO_ZOLTRIX alpha=m i386=m
-I2C_SI4713 all=m
-RADIO_SI4713 all=m
-USB_DSBR all=m
-RADIO_SI470X all=y
-#- file drivers/media/radio/si470x/Kconfig goes here
-USB_MR800 all=m
-RADIO_TEA5764 all=m
-RADIO_SAA7706H all=m
-RADIO_TEF6862 all=m
-RADIO_TIMBERDALE all=m
-RADIO_WL1273 all=m
-#- file drivers/media/radio/wl128x/Kconfig goes here
 
 #-
 #- *** FILE: drivers/media/radio/si470x/Kconfig ***
@@ -2011,8 +2157,10 @@ IR_RC6_DECODER all=m
 IR_JVC_DECODER all=m
 IR_SONY_DECODER all=m
 IR_RC5_SZ_DECODER all=m
+IR_SANYO_DECODER all=m
 IR_MCE_KBD_DECODER all=m
 IR_LIRC_CODEC all=m
+RC_ATI_REMOTE all=m
 IR_ENE all=m
 IR_IMON all=m
 IR_MCEUSB all=m
@@ -2023,6 +2171,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 ***
@@ -2075,38 +2224,59 @@ 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
 #- Flash devices
 #- Video improvement chips
 VIDEO_UPD64031A all=m
 VIDEO_UPD64083 all=m
 #- Miscelaneous helper chips
 VIDEO_VIVI all=m
-#- file drivers/media/video/davinci/Kconfig goes here
-#- file drivers/media/video/omap/Kconfig goes here
-#- file drivers/media/video/bt8xx/Kconfig goes here
-VIDEO_PMS all=m
-VIDEO_BWQCAM all=m
-VIDEO_CQCAM all=m
-VIDEO_W9966 all=m
+V4L_USB_DRIVERS all=y sparc=n
+#- 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/et61x251/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
-#- file drivers/media/video/zoran/Kconfig goes here
-VIDEO_MEYE i386=m x86_64=m
-#- file drivers/media/video/saa7134/Kconfig goes here
-VIDEO_MXB all=m sparc=n
-VIDEO_HEXIUM_ORION all=m
-VIDEO_HEXIUM_GEMINI all=m
-VIDEO_TIMBERDALE all=m
-#- file drivers/media/video/cx88/Kconfig goes here
-#- file drivers/media/video/cx23885/Kconfig goes here
+USB_ZR364XX all=m
+USB_STKWEBCAM all=m
+USB_S2255 all=m
+V4L_PCI_DRIVERS all=y
 #- file drivers/media/video/au0828/Kconfig goes here
-#- file drivers/media/video/ivtv/Kconfig goes here
+#- 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_SR030PC30 all=m
 VIDEO_VIA_CAMERA all=m
-VIDEO_NOON010PC30 all=m
-#- file drivers/media/video/m5mols/Kconfig goes here
+#- 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
@@ -2118,27 +2288,13 @@ 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-tv/Kconfig goes here
-V4L_USB_DRIVERS all=y sparc=n
-#- 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/usbvision/Kconfig goes here
-#- file drivers/media/video/et61x251/Kconfig goes here
-#- file drivers/media/video/sn9c102/Kconfig goes here
-#- file drivers/media/video/pwc/Kconfig goes here
-USB_ZR364XX all=m
-USB_STKWEBCAM all=m
-USB_S2255 all=m
 V4L_MEM2MEM_DRIVERS all=y
 VIDEO_MEM2MEM_TESTDEV all=m
 
@@ -2178,6 +2334,12 @@ VIDEO_CX231XX_DVB all=m
 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 ***
 #-
@@ -2198,6 +2360,7 @@ VIDEO_CX88_VP3054 all=m
 VIDEO_EM28XX all=m
 VIDEO_EM28XX_ALSA all=m sparc=n
 VIDEO_EM28XX_DVB all=m sparc=n
+VIDEO_EM28XX_RC all=y
 
 #-
 #- *** FILE: drivers/media/video/et61x251/Kconfig ***
@@ -2217,6 +2380,7 @@ USB_GSPCA_CPIA1 all=m
 USB_GSPCA_ETOMS all=m
 USB_GSPCA_FINEPIX all=m
 USB_GSPCA_JEILINJ all=m
+USB_GSPCA_JL2005BCD all=m
 USB_GSPCA_KINECT all=m
 USB_GSPCA_KONICA all=m
 USB_GSPCA_MARS all=m
@@ -2228,6 +2392,7 @@ USB_GSPCA_OV534_9 all=m
 USB_GSPCA_PAC207 all=m
 USB_GSPCA_PAC7302 all=m
 USB_GSPCA_PAC7311 all=m
+USB_GSPCA_SE401 all=m
 USB_GSPCA_SN9C2028 all=m
 USB_GSPCA_SN9C20X all=m
 USB_GSPCA_SONIXB all=m
@@ -2246,6 +2411,7 @@ USB_GSPCA_STK014 all=m
 USB_GSPCA_STV0680 all=m
 USB_GSPCA_SUNPLUS all=m
 USB_GSPCA_T613 all=m
+USB_GSPCA_TOPRO all=m
 USB_GSPCA_TV8532 all=m
 USB_GSPCA_VC032X all=m
 USB_GSPCA_VICAM all=m
@@ -2326,6 +2492,13 @@ USB_SN9C102 all=m
 #-
 VIDEO_TLG2300 all=m
 
+#-
+#- *** FILE: drivers/media/video/tm6000/Kconfig ***
+#-
+VIDEO_TM6000 all=m
+VIDEO_TM6000_ALSA all=m
+VIDEO_TM6000_DVB all=m
+
 #-
 #- *** FILE: drivers/media/video/usbvision/Kconfig ***
 #-
@@ -2401,7 +2574,6 @@ I2O_PROC all=m
 #-
 #- *** FILE: drivers/mfd/Kconfig ***
 #-
-MFD_SUPPORT all=y
 MFD_SM501 all=m
 MFD_SM501_GPIO all=y
 HTC_PASIC3 all=m
@@ -2409,10 +2581,14 @@ 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
+MFD_STMPE all=y
+STMPE_SPI all=y
 PMIC_DA903X powerpc=y
+MFD_DA9052_SPI all=y
 MFD_WM8400 all=m
 MFD_WM831X all=y
 MFD_WM831X_SPI all=y
@@ -2442,7 +2618,6 @@ MFD_WL1273_CORE all=m
 #- *** FILE: drivers/misc/Kconfig ***
 #-
 SENSORS_LIS3LV02D all=m
-MISC_DEVICES all=y
 AD525X_DPOT all=m
 AD525X_DPOT_I2C all=m
 AD525X_DPOT_SPI all=m
@@ -2481,6 +2656,13 @@ USB_SWITCH_FSA9480 all=m
 #- file drivers/misc/ti-st/Kconfig goes here
 #- file drivers/misc/lis3lv02d/Kconfig goes here
 #- file drivers/misc/carma/Kconfig goes here
+#- file drivers/misc/altera-stapl/Kconfig goes here
+
+#-
+#- *** FILE: drivers/misc/altera-stapl/Kconfig ***
+#-
+#- Altera FPGA firmware download module
+ALTERA_STAPL all=m
 
 #-
 #- *** FILE: drivers/misc/c2port/Kconfig ***
@@ -2568,7 +2750,6 @@ MMC_USHC all=m
 #- *** FILE: drivers/mtd/Kconfig ***
 #-
 MTD all=m
-MTD_DEBUG all=n
 MTD_TESTS all=m
 MTD_REDBOOT_PARTS all=m
 MTD_REDBOOT_DIRECTORY_BLOCK all=-1
@@ -2650,6 +2831,7 @@ MTD_BLOCK2MTD all=m
 MTD_DOC2000 all=m
 MTD_DOC2001 all=m
 MTD_DOC2001PLUS all=m
+MTD_DOCG3 all=m
 MTD_DOCPROBE all=m
 MTD_DOCECC all=m
 MTD_DOCPROBE_ADVANCED all=n
@@ -2710,6 +2892,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
@@ -2741,233 +2924,47 @@ MTD_UBI_DEBUG all=n
 #- *** FILE: drivers/net/Kconfig ***
 #-
 NETDEVICES all=y
-IFB all=m
-DUMMY all=m
 BONDING all=m
+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
-EQUALIZER all=m
+NETCONSOLE all=m
+NETCONSOLE_DYNAMIC all=y
+NETPOLL_TRAP all=y
+RIONET all=m
+RIONET_TX_SIZE all=128
+RIONET_RX_SIZE all=128
 TUN all=m
 VETH all=m
-NET_SB1000 all=m
+VIRTIO_NET all=m
 #- file drivers/net/arcnet/Kconfig goes here
-MII all=m
+#- file drivers/atm/Kconfig goes here
+#- file drivers/net/caif/Kconfig goes here
+#- file drivers/net/dsa/Kconfig goes here
+#- file drivers/net/ethernet/Kconfig goes here
+#- file drivers/net/fddi/Kconfig goes here
+#- file drivers/net/hippi/Kconfig goes here
+NET_SB1000 all=m
 #- file drivers/net/phy/Kconfig goes here
-NET_ETHERNET all=y
-#- file drivers/net/arm/Kconfig goes here
-MACE ppc=m
-MACE_AAUI_PORT ppc=y
-BMAC ppc=m
-SUNLANCE sparc=m sparc64=m
-HAPPYMEAL all=m
-SUNBMAC sparc=m sparc64=m
-SUNQE sparc=m sparc64=m
-SUNGEM all=m
-CASSINI all=m sparc=n
-SUNVNET sparc64=m
-NET_VENDOR_3COM all=y
-EL1 alpha=m i386=m
-EL2 alpha=m i386=m
-ELPLUS alpha=m i386=m
-EL16 alpha=m i386=m
-EL3 alpha=n i386=m
-3C515 alpha=m i386=m
-ELMC i386=m
-ELMC_II i386=m
-VORTEX all=m
-TYPHOON all=m
-LANCE alpha=m i386=m
-NET_VENDOR_SMC alpha=y i386=y
-WD80x3 alpha=m i386=m
-ULTRAMCA i386=m
-ULTRA alpha=m i386=m
-ULTRA32 alpha=m i386=m
-SMC9194 alpha=m i386=m
-ENC28J60 all=m
-ENC28J60_WRITEVERIFY all=n
-ETHOC all=m
-NET_VENDOR_RACAL alpha=y i386=y
-NI5010 i386=m
-NI52 alpha=m i386=m
-NI65 alpha=m i386=m
-DNET all=m
-#- file drivers/net/tulip/Kconfig goes here
-AT1700 alpha=m i386=m
-DEPCA alpha=m i386=m
-HP100 all=m
-NET_ISA alpha=y i386=y
-E2100 alpha=m i386=m
-EWRK3 alpha=m i386=m
-EEXPRESS alpha=m i386=m
-EEXPRESS_PRO alpha=m i386=m
-HPLAN_PLUS alpha=m i386=m
-HPLAN alpha=m i386=m
-LP486E alpha=m i386=m
-ETH16I alpha=m i386=m
-NE2000 alpha=m i386=m
-ZNET alpha=m i386=m
-SEEQ8005 alpha=n i386=m
-NE2_MCA i386=m
-IBMLANA i386=m
-IBMVETH ppc64=m
-#- file drivers/net/ibm_newemac/Kconfig goes here
-NET_PCI all=y
-PCNET32 all=m
-AMD8111_ETH all=m
-ADAPTEC_STARFIRE all=m
-AC3200 alpha=m i386=m
-KSZ884X_PCI all=m
-APRICOT alpha=m i386=m
-B44 all=m
-FORCEDETH all=m
-CS89x0 alpha=m i386=m
-E100 all=m
-LNE390 alpha=m i386=m
-FEALNX all=m
-NATSEMI all=m
-NE2K_PCI all=m
-NE3210 alpha=m i386=m
-ES3210 alpha=m i386=m
-8139CP all=m
-8139TOO all=m
-8139TOO_PIO all=n
-8139TOO_TUNE_TWISTER all=y alpha=n
-8139TOO_8129 all=y alpha=n
-8139_OLD_RX_RESET all=n ppc=y ppc64=y
-R6040 all=m
-SIS900 all=m
-EPIC100 all=m
-SMSC9420 all=m
-SUNDANCE all=m
-SUNDANCE_MMIO all=n sparc=y sparc64=y
-TLAN all=m sparc=n
-KS8842 all=m
-KS8851 all=m
-KS8851_MLL all=m
-VIA_RHINE all=m
-VIA_RHINE_MMIO all=y alpha=n
-SC92031 all=m
-NET_POCKET all=y
-ATP i386=m x86_64=m
-DE600 all=m
-DE620 all=m
-FEC_MPC52xx ppc=m
-FEC_MPC52xx_MDIO ppc=y
-ATL2 all=m
-XILINX_EMACLITE powerpc=m
-#- file drivers/net/fs_enet/Kconfig goes here
-#- file drivers/net/octeon/Kconfig goes here
-NETDEV_1000 all=y
-ACENIC all=m sparc=n
-ACENIC_OMIT_TIGON_I all=n
-DL2K all=m
-E1000 all=m sparc=n
-E1000E all=m
-IP1000 all=m
-IGB all=m
-IGB_DCA all=y
-IGBVF all=m
-#- file drivers/net/ixp2000/Kconfig goes here
-NS83820 all=m
-HAMACHI all=m
-YELLOWFIN all=m
-R8169 all=m sparc=n
-SIS190 all=m sparc=n
-SKGE all=m
-SKGE_DEBUG all=n
-SKGE_GENESIS all=y
-SKY2 all=m sparc=n
-SKY2_DEBUG all=n
-VIA_VELOCITY all=m
-TIGON3 all=m
-BNX2 all=m
-CNIC all=m
-SPIDER_NET ppc64=m
-GELIC_NET ppc64=m
-GELIC_WIRELESS ppc64=y
-GIANFAR ppc=m
-MV643XX_ETH ppc=m
-QLA3XXX all=m sparc=n
-ATL1 all=m sparc=n
-ATL1E all=m
-ATL1C all=m
-JME all=m
-#- file drivers/net/stmmac/Kconfig goes here
-PCH_GBE all=m
-NETDEV_10000 all=y
-CHELSIO_T1 all=m sparc=n
-CHELSIO_T1_1G all=y
-CHELSIO_T3 all=m
-CHELSIO_T4 all=m
-CHELSIO_T4VF all=m
-ENIC all=m
-IXGBE all=m
-IXGBE_DCA all=y
-IXGBE_DCB all=y
-IXGBEVF all=m
-IXGB all=m sparc=n
-S2IO all=m sparc=n
-VXGE all=m
-VXGE_DEBUG_TRACE_ALL all=n
-MYRI10GE all=m sparc=n
-MYRI10GE_DCA all=y sparc=n
-NETXEN_NIC all=m sparc=n
-NIU all=m
-PASEMI_MAC ppc64=m
-MLX4_EN all=m
-MLX4_CORE all=m
-TEHUTI all=m
-BNX2X all=m
-QLCNIC all=m
-QLGE all=m
-BNA all=m
-#- file drivers/net/sfc/Kconfig goes here
-#- file drivers/net/benet/Kconfig goes here
+#- file drivers/net/plip/Kconfig goes here
+#- file drivers/net/ppp/Kconfig goes here
+#- file drivers/net/slip/Kconfig goes here
+#- file drivers/s390/net/Kconfig goes here
 #- file drivers/net/tokenring/Kconfig goes here
+#- file drivers/net/usb/Kconfig goes here
 #- file drivers/net/wireless/Kconfig goes here
 #- file drivers/net/wimax/Kconfig goes here
-#- file drivers/net/usb/Kconfig goes here
-#- file drivers/net/pcmcia/Kconfig goes here
 #- file drivers/net/wan/Kconfig goes here
-#- file drivers/atm/Kconfig goes here
-#- file drivers/ieee802154/Kconfig goes here
-#- file drivers/s390/net/Kconfig goes here
-#- file drivers/net/caif/Kconfig goes here
-ISERIES_VETH ppc64=n
-RIONET all=m
-RIONET_TX_SIZE all=128
-RIONET_RX_SIZE all=128
-FDDI all=y
-DEFXX all=m
-DEFXX_MMIO all=n
-SKFP all=m
-HIPPI all=y
-ROADRUNNER all=m
-ROADRUNNER_LARGE_RINGS all=n
-PLIP all=m
-PPP all=m
-PPP_MULTILINK all=y
-PPP_FILTER all=y
-PPP_ASYNC all=m
-PPP_SYNC_TTY all=m
-PPP_DEFLATE all=m
-PPP_BSDCOMP all=m
-PPP_MPPE all=m
-PPPOE all=m
-PPTP all=m
-PPPOATM all=m
-PPPOL2TP all=m
-SLIP all=m
-SLIP_COMPRESSED all=y
-SLHC all=m
-SLIP_SMART all=y
-SLIP_MODE_SLIP6 all=y
-NET_FC all=y
-NETCONSOLE all=m
-NETCONSOLE_DYNAMIC all=y
-NETPOLL_TRAP all=y
-VIRTIO_NET all=m
+XEN_NETDEV_FRONTEND all=m
+XEN_NETDEV_BACKEND all=m
 VMXNET3 all=m
+#- file drivers/net/hyperv/Kconfig goes here
 
 #-
 #- *** FILE: drivers/net/appletalk/Kconfig ***
@@ -2996,67 +2993,620 @@ ARCNET_RIM_I all=m
 ARCNET_COM20020 all=m
 ARCNET_COM20020_ISA alpha=m i386=m
 ARCNET_COM20020_PCI all=m
+ARCNET_COM20020_CS all=m
+
+#-
+#- *** FILE: drivers/net/caif/Kconfig ***
+#-
+#- CAIF transport drivers
+CAIF_TTY all=m
+CAIF_SPI_SLAVE all=m
+CAIF_SPI_SYNC all=y
+CAIF_HSI all=m
+
+#-
+#- *** FILE: drivers/net/can/Kconfig ***
+#-
+CAN_VCAN all=m
+CAN_SLCAN all=m
+CAN_DEV all=m
+CAN_CALC_BITTIMING all=y
+CAN_MCP251X all=m
+CAN_JANZ_ICAN3 all=m
+PCH_CAN all=m
+#- file drivers/net/can/mscan/Kconfig goes here
+#- file drivers/net/can/sja1000/Kconfig goes here
+#- file drivers/net/can/c_can/Kconfig goes here
+#- file drivers/net/can/cc770/Kconfig goes here
+#- file drivers/net/can/usb/Kconfig goes here
+#- file drivers/net/can/softing/Kconfig goes here
+CAN_DEBUG_DEVICES all=n
+
+#-
+#- *** FILE: drivers/net/can/c_can/Kconfig ***
+#-
+CAN_C_CAN all=m
+CAN_C_CAN_PLATFORM all=m
+
+#-
+#- *** FILE: drivers/net/can/cc770/Kconfig ***
+#-
+CAN_CC770 all=m
+CAN_CC770_ISA all=m
+CAN_CC770_PLATFORM all=m
+
+#-
+#- *** FILE: drivers/net/can/sja1000/Kconfig ***
+#-
+CAN_SJA1000 all=m
+CAN_SJA1000_ISA all=m
+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
+
+#-
+#- *** FILE: drivers/net/can/softing/Kconfig ***
+#-
+CAN_SOFTING all=m
+CAN_SOFTING_CS all=m
+
+#-
+#- *** FILE: drivers/net/can/usb/Kconfig ***
+#-
+CAN_EMS_USB all=m
+CAN_ESD_USB2 all=m
+CAN_PEAK_USB all=m
+
+#-
+#- *** FILE: drivers/net/dsa/Kconfig ***
+#-
+NET_DSA_MV88E6060 all=y
+NET_DSA_MV88E6131 all=y
+NET_DSA_MV88E6123_61_65 all=y
+
+#-
+#- *** FILE: drivers/net/ethernet/3com/Kconfig ***
+#-
+NET_VENDOR_3COM all=y
+EL1 alpha=m i386=m
+EL3 alpha=n i386=m
+3C515 alpha=m i386=m
+PCMCIA_3C574 all=m
+PCMCIA_3C589 all=m
+VORTEX all=m
+TYPHOON all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/8390/Kconfig ***
+#-
+NET_VENDOR_8390 all=y
+EL2 alpha=m i386=m
+AC3200 alpha=m i386=m
+PCMCIA_AXNET all=m
+E2100 alpha=m i386=m
+ES3210 alpha=m i386=m
+HPLAN_PLUS alpha=m i386=m
+HPLAN alpha=m i386=m
+LNE390 alpha=m i386=m
+NE2000 alpha=m i386=m
+NE2_MCA i386=m
+NE2K_PCI all=m
+NE3210 alpha=m i386=m
+PCMCIA_PCNET all=m
+ULTRAMCA i386=m
+ULTRA alpha=m i386=m
+ULTRA32 alpha=m i386=m
+WD80x3 alpha=m i386=m
+
+#-
+#- *** FILE: drivers/net/ethernet/Kconfig ***
+#-
+#- file drivers/net/ethernet/3com/Kconfig goes here
+#- file drivers/net/ethernet/adaptec/Kconfig goes here
+#- file drivers/net/ethernet/aeroflex/Kconfig goes here
+#- file drivers/net/ethernet/alteon/Kconfig goes here
+#- file drivers/net/ethernet/amd/Kconfig goes here
+#- file drivers/net/ethernet/apple/Kconfig goes here
+#- file drivers/net/ethernet/atheros/Kconfig goes here
+#- file drivers/net/ethernet/cadence/Kconfig goes here
+#- file drivers/net/ethernet/adi/Kconfig goes here
+#- file drivers/net/ethernet/broadcom/Kconfig goes here
+#- file drivers/net/ethernet/brocade/Kconfig goes here
+#- file drivers/net/ethernet/calxeda/Kconfig goes here
+#- file drivers/net/ethernet/chelsio/Kconfig goes here
+#- file drivers/net/ethernet/cirrus/Kconfig goes here
+#- file drivers/net/ethernet/cisco/Kconfig goes here
+#- file drivers/net/ethernet/davicom/Kconfig goes here
+DNET all=m
+#- file drivers/net/ethernet/dec/Kconfig goes here
+#- file drivers/net/ethernet/dlink/Kconfig goes here
+#- file drivers/net/ethernet/emulex/Kconfig goes here
+#- file drivers/net/ethernet/neterion/Kconfig goes here
+#- file drivers/net/ethernet/faraday/Kconfig goes here
+#- file drivers/net/ethernet/freescale/Kconfig goes here
+#- file drivers/net/ethernet/fujitsu/Kconfig goes here
+#- file drivers/net/ethernet/hp/Kconfig goes here
+#- file drivers/net/ethernet/ibm/Kconfig goes here
+#- file drivers/net/ethernet/intel/Kconfig goes here
+#- file drivers/net/ethernet/i825xx/Kconfig goes here
+#- file drivers/net/ethernet/xscale/Kconfig goes here
+#- file drivers/net/ethernet/icplus/Kconfig goes here
+JME all=m
+#- file drivers/net/ethernet/marvell/Kconfig goes here
+#- file drivers/net/ethernet/mellanox/Kconfig goes here
+#- file drivers/net/ethernet/micrel/Kconfig goes here
+#- file drivers/net/ethernet/microchip/Kconfig goes here
+#- file drivers/net/ethernet/myricom/Kconfig goes here
+FEALNX all=m
+#- file drivers/net/ethernet/natsemi/Kconfig goes here
+#- 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
+#- file drivers/net/ethernet/packetengines/Kconfig goes here
+#- file drivers/net/ethernet/pasemi/Kconfig goes here
+#- file drivers/net/ethernet/qlogic/Kconfig goes here
+#- file drivers/net/ethernet/racal/Kconfig goes here
+#- file drivers/net/ethernet/realtek/Kconfig goes here
+#- file drivers/net/ethernet/renesas/Kconfig goes here
+#- file drivers/net/ethernet/rdc/Kconfig goes here
+#- file drivers/net/ethernet/seeq/Kconfig goes here
+#- file drivers/net/ethernet/silan/Kconfig goes here
+#- file drivers/net/ethernet/sis/Kconfig goes here
+#- file drivers/net/ethernet/sfc/Kconfig goes here
+#- file drivers/net/ethernet/sgi/Kconfig goes here
+#- file drivers/net/ethernet/smsc/Kconfig goes here
+#- file drivers/net/ethernet/stmicro/Kconfig goes here
+#- file drivers/net/ethernet/sun/Kconfig goes here
+#- file drivers/net/ethernet/tehuti/Kconfig goes here
+#- file drivers/net/ethernet/ti/Kconfig goes here
+#- file drivers/net/ethernet/tile/Kconfig goes here
+#- file drivers/net/ethernet/toshiba/Kconfig goes here
+#- file drivers/net/ethernet/tundra/Kconfig goes here
+#- file drivers/net/ethernet/via/Kconfig goes here
+#- file drivers/net/ethernet/xilinx/Kconfig goes here
+#- file drivers/net/ethernet/xircom/Kconfig goes here
+
+#-
+#- *** FILE: drivers/net/ethernet/adaptec/Kconfig ***
+#-
+NET_VENDOR_ADAPTEC all=y
+ADAPTEC_STARFIRE all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/alteon/Kconfig ***
+#-
+NET_VENDOR_ALTEON all=y
+ACENIC all=m sparc=n
+ACENIC_OMIT_TIGON_I all=n
+
+#-
+#- *** FILE: drivers/net/ethernet/amd/Kconfig ***
+#-
+NET_VENDOR_AMD all=y
+AMD8111_ETH all=m
+LANCE alpha=m i386=m
+PCNET32 all=m
+DEPCA alpha=m i386=m
+PCMCIA_NMCLAN all=m
+NI65 alpha=m i386=m
+SUNLANCE sparc=m sparc64=m
+
+#-
+#- *** FILE: drivers/net/ethernet/apple/Kconfig ***
+#-
+MACE ppc=m
+MACE_AAUI_PORT ppc=y
+BMAC ppc=m
+
+#-
+#- *** FILE: drivers/net/ethernet/atheros/Kconfig ***
+#-
+NET_VENDOR_ATHEROS all=y
+ATL2 all=m
+ATL1 all=m sparc=n
+ATL1E all=m
+ATL1C all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/broadcom/Kconfig ***
+#-
+B44 all=m
+BNX2 all=m
+CNIC all=m
+TIGON3 all=m
+BNX2X all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/brocade/Kconfig ***
+#-
+NET_VENDOR_BROCADE all=y
+#- file drivers/net/ethernet/brocade/bna/Kconfig goes here
+
+#-
+#- *** FILE: drivers/net/ethernet/brocade/bna/Kconfig ***
+#-
+BNA all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/calxeda/Kconfig ***
+#-
+NET_CALXEDA_XGMAC all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/chelsio/Kconfig ***
+#-
+CHELSIO_T1 all=m sparc=n
+CHELSIO_T1_1G all=y
+CHELSIO_T3 all=m
+CHELSIO_T4 all=m
+CHELSIO_T4VF all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/cirrus/Kconfig ***
+#-
+CS89x0 alpha=m i386=m
+
+#-
+#- *** FILE: drivers/net/ethernet/cisco/Kconfig ***
+#-
+NET_VENDOR_CISCO all=y
+#- file drivers/net/ethernet/cisco/enic/Kconfig goes here
+
+#-
+#- *** FILE: drivers/net/ethernet/cisco/enic/Kconfig ***
+#-
+ENIC all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/dec/Kconfig ***
+#-
+NET_VENDOR_DEC all=y
+EWRK3 alpha=m i386=m
+#- file drivers/net/ethernet/dec/tulip/Kconfig goes here
+
+#-
+#- *** FILE: drivers/net/ethernet/dec/tulip/Kconfig ***
+#-
+NET_TULIP all=y
+DE2104X all=m
+DE2104X_DSL all=0
+TULIP all=m
+TULIP_MWI all=n
+TULIP_MMIO all=n
+TULIP_NAPI all=y
+TULIP_NAPI_HW_MITIGATION all=y
+DE4X5 all=m
+WINBOND_840 all=m
+DM9102 all=m
+ULI526X all=m
+PCMCIA_XIRCOM all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/dlink/Kconfig ***
+#-
+NET_VENDOR_DLINK all=y
+DE600 all=m
+DE620 all=m
+DL2K all=m
+SUNDANCE all=m
+SUNDANCE_MMIO all=n sparc=y sparc64=y
+
+#-
+#- *** FILE: drivers/net/ethernet/emulex/Kconfig ***
+#-
+NET_VENDOR_EMULEX all=y
+#- file drivers/net/ethernet/emulex/benet/Kconfig goes here
+
+#-
+#- *** FILE: drivers/net/ethernet/emulex/benet/Kconfig ***
+#-
+BE2NET all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/freescale/Kconfig ***
+#-
+FEC_MPC52xx ppc=m
+FEC_MPC52xx_MDIO ppc=y
+#- file drivers/net/ethernet/freescale/fs_enet/Kconfig goes here
+GIANFAR ppc=m
+
+#-
+#- *** FILE: drivers/net/ethernet/fujitsu/Kconfig ***
+#-
+NET_VENDOR_FUJITSU all=y
+AT1700 alpha=m i386=m
+PCMCIA_FMVJ18X all=m
+ETH16I alpha=m i386=m
+
+#-
+#- *** FILE: drivers/net/ethernet/hp/Kconfig ***
+#-
+NET_VENDOR_HP all=y
+HP100 all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/i825xx/Kconfig ***
+#-
+NET_VENDOR_I825XX all=y
+ELPLUS alpha=m i386=m
+EL16 alpha=m i386=m
+ELMC i386=m
+ELMC_II i386=m
+APRICOT alpha=m i386=m
+EEXPRESS alpha=m i386=m
+EEXPRESS_PRO alpha=m i386=m
+LP486E alpha=m i386=m
+NI52 alpha=m i386=m
+ZNET all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/ibm/Kconfig ***
+#-
+IBMVETH ppc64=m
+#- file drivers/net/ethernet/ibm/emac/Kconfig goes here
+
+#-
+#- *** FILE: drivers/net/ethernet/icplus/Kconfig ***
+#-
+IP1000 all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/intel/Kconfig ***
+#-
+NET_VENDOR_INTEL all=y
+E100 all=m
+E1000 all=m sparc=n
+E1000E all=m
+IGB all=m
+IGB_DCA all=y
+IGBVF all=m
+IXGB all=m sparc=n
+IXGBE all=m
+IXGBE_DCA all=y
+IXGBE_DCB all=y
+IXGBEVF all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/marvell/Kconfig ***
+#-
+NET_VENDOR_MARVELL all=y
+MV643XX_ETH ppc=m
+SKGE all=m
+SKGE_DEBUG all=n
+SKGE_GENESIS all=y
+SKY2 all=m sparc=n
+SKY2_DEBUG all=n
+
+#-
+#- *** FILE: drivers/net/ethernet/mellanox/mlx4/Kconfig ***
+#-
+MLX4_EN all=m
+MLX4_CORE all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/micrel/Kconfig ***
+#-
+NET_VENDOR_MICREL all=y
+KS8842 all=m
+KS8851 all=m
+KS8851_MLL all=m
+KSZ884X_PCI all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/microchip/Kconfig ***
+#-
+NET_VENDOR_MICROCHIP all=y
+ENC28J60 all=m
+ENC28J60_WRITEVERIFY all=n
+
+#-
+#- *** FILE: drivers/net/ethernet/myricom/Kconfig ***
+#-
+NET_VENDOR_MYRI all=y
+MYRI10GE all=m sparc=n
+MYRI10GE_DCA all=y sparc=n
+
+#-
+#- *** FILE: drivers/net/ethernet/natsemi/Kconfig ***
+#-
+NET_VENDOR_NATSEMI all=y
+IBMLANA i386=m
+NATSEMI all=m
+NS83820 all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/neterion/Kconfig ***
+#-
+NET_VENDOR_EXAR all=y
+S2IO all=m sparc=n
+VXGE all=m
+VXGE_DEBUG_TRACE_ALL all=n
+
+#-
+#- *** FILE: drivers/net/ethernet/nvidia/Kconfig ***
+#-
+NET_VENDOR_NVIDIA all=y
+FORCEDETH all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/oki-semi/Kconfig ***
+#-
+NET_VENDOR_OKI all=y
+#- file drivers/net/ethernet/oki-semi/pch_gbe/Kconfig goes here
+
+#-
+#- *** FILE: drivers/net/ethernet/oki-semi/pch_gbe/Kconfig ***
+#-
+PCH_GBE all=m
+PCH_PTP all=y
+
+#-
+#- *** FILE: drivers/net/ethernet/packetengines/Kconfig ***
+#-
+NET_PACKET_ENGINE all=y
+HAMACHI all=m
+YELLOWFIN all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/pasemi/Kconfig ***
+#-
+PASEMI_MAC ppc64=m
+
+#-
+#- *** FILE: drivers/net/ethernet/qlogic/Kconfig ***
+#-
+NET_VENDOR_QLOGIC all=y
+QLA3XXX all=m sparc=n
+QLCNIC all=m
+QLGE all=m
+NETXEN_NIC all=m sparc=n
+
+#-
+#- *** FILE: drivers/net/ethernet/racal/Kconfig ***
+#-
+NET_VENDOR_RACAL alpha=y i386=y
+NI5010 i386=m
+
+#-
+#- *** FILE: drivers/net/ethernet/rdc/Kconfig ***
+#-
+NET_VENDOR_RDC all=y
+R6040 all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/realtek/Kconfig ***
+#-
+NET_VENDOR_REALTEK all=y
+ATP i386=m x86_64=m
+8139CP all=m
+8139TOO all=m
+8139TOO_PIO all=n
+8139TOO_TUNE_TWISTER all=y alpha=n
+8139TOO_8129 all=y alpha=n
+8139_OLD_RX_RESET all=n ppc=y ppc64=y
+R8169 all=m sparc=n
+
+#-
+#- *** FILE: drivers/net/ethernet/seeq/Kconfig ***
+#-
+NET_VENDOR_SEEQ all=y
+SEEQ8005 all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/sfc/Kconfig ***
+#-
+SFC all=m sparc=n
+SFC_MTD all=y
+SFC_MCDI_MON all=y
+SFC_SRIOV all=y
+
+#-
+#- *** FILE: drivers/net/ethernet/silan/Kconfig ***
+#-
+NET_VENDOR_SILAN all=y
+SC92031 all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/sis/Kconfig ***
+#-
+NET_VENDOR_SIS all=y
+SIS900 all=m
+SIS190 all=m sparc=n
+
+#-
+#- *** FILE: drivers/net/ethernet/smsc/Kconfig ***
+#-
+NET_VENDOR_SMSC all=y
+SMC9194 alpha=m i386=m
+PCMCIA_SMC91C92 all=m
+EPIC100 all=m
+SMSC9420 all=m
+
+#-
+#- *** FILE: drivers/net/ethernet/stmicro/Kconfig ***
+#-
+NET_VENDOR_STMICRO all=y
+#- file drivers/net/ethernet/stmicro/stmmac/Kconfig goes here
+
+#-
+#- *** FILE: drivers/net/ethernet/stmicro/stmmac/Kconfig ***
+#-
+STMMAC_ETH all=m
+STMMAC_PLATFORM all=m
+STMMAC_PCI all=m
+STMMAC_DEBUG_FS all=y
+STMMAC_DA all=y
+STMMAC_RING all=y
+STMMAC_CHAINED all=n
+
+#-
+#- *** FILE: drivers/net/ethernet/sun/Kconfig ***
+#-
+NET_VENDOR_SUN all=y
+HAPPYMEAL all=m
+SUNBMAC sparc=m sparc64=m
+SUNQE sparc=m sparc64=m
+SUNGEM all=m
+CASSINI all=m sparc=n
+SUNVNET sparc64=m
+NIU all=m
 
 #-
-#- *** FILE: drivers/net/benet/Kconfig ***
+#- *** FILE: drivers/net/ethernet/tehuti/Kconfig ***
 #-
-BE2NET all=m
+NET_VENDOR_TEHUTI all=y
+TEHUTI all=m
 
 #-
-#- *** FILE: drivers/net/caif/Kconfig ***
+#- *** FILE: drivers/net/ethernet/ti/Kconfig ***
 #-
-#- CAIF transport drivers
-CAIF_TTY all=m
-CAIF_SPI_SLAVE all=m
-CAIF_SPI_SYNC all=y
-CAIF_HSI all=m
+NET_VENDOR_TI all=y
+TLAN all=m sparc=n
 
 #-
-#- *** FILE: drivers/net/can/Kconfig ***
+#- *** FILE: drivers/net/ethernet/toshiba/Kconfig ***
 #-
-CAN_VCAN all=m
-CAN_SLCAN all=m
-CAN_DEV all=m
-CAN_CALC_BITTIMING all=y
-CAN_MCP251X all=m
-CAN_JANZ_ICAN3 all=m
-PCH_CAN all=m
-#- file drivers/net/can/mscan/Kconfig goes here
-#- file drivers/net/can/sja1000/Kconfig goes here
-#- file drivers/net/can/c_can/Kconfig goes here
-#- file drivers/net/can/usb/Kconfig goes here
-#- file drivers/net/can/softing/Kconfig goes here
-CAN_DEBUG_DEVICES all=n
+GELIC_NET ppc64=m
+GELIC_WIRELESS ppc64=y
+SPIDER_NET ppc64=m
 
 #-
-#- *** FILE: drivers/net/can/c_can/Kconfig ***
+#- *** FILE: drivers/net/ethernet/via/Kconfig ***
 #-
-CAN_C_CAN all=m
-CAN_C_CAN_PLATFORM all=m
+NET_VENDOR_VIA all=y
+VIA_RHINE all=m
+VIA_RHINE_MMIO all=y alpha=n
+VIA_VELOCITY all=m
 
 #-
-#- *** FILE: drivers/net/can/sja1000/Kconfig ***
+#- *** FILE: drivers/net/ethernet/xilinx/Kconfig ***
 #-
-CAN_SJA1000 all=m
-CAN_SJA1000_ISA all=m
-CAN_SJA1000_PLATFORM all=m
-CAN_SJA1000_OF_PLATFORM powerpc=m
-CAN_EMS_PCI all=m
-CAN_KVASER_PCI all=m
-CAN_PLX_PCI all=m
-CAN_TSCAN1 all=m
+XILINX_EMACLITE powerpc=m
 
 #-
-#- *** FILE: drivers/net/can/softing/Kconfig ***
+#- *** FILE: drivers/net/ethernet/xircom/Kconfig ***
 #-
-CAN_SOFTING all=m
-CAN_SOFTING_CS all=m
+NET_VENDOR_XIRCOM all=y
+PCMCIA_XIRC2PS all=m
 
 #-
-#- *** FILE: drivers/net/can/usb/Kconfig ***
+#- *** FILE: drivers/net/fddi/Kconfig ***
 #-
-CAN_EMS_USB all=m
-CAN_ESD_USB2 all=m
+FDDI all=y
+DEFXX all=m
+DEFXX_MMIO all=n
+SKFP all=m
 
 #-
 #- *** FILE: drivers/net/hamradio/Kconfig ***
@@ -3075,15 +3625,16 @@ BAYCOM_EPP all=m
 YAM all=m
 
 #-
-#- *** FILE: drivers/net/ibm_newemac/Kconfig ***
+#- *** FILE: drivers/net/hippi/Kconfig ***
 #-
-IBM_NEW_EMAC ppc64=m
-IBM_NEW_EMAC_RXB ppc64=128
-IBM_NEW_EMAC_TXB ppc64=64
-IBM_NEW_EMAC_POLL_WEIGHT ppc64=32
-IBM_NEW_EMAC_RX_COPY_THRESHOLD ppc64=256
-IBM_NEW_EMAC_RX_SKB_HEADROOM ppc64=0
-IBM_NEW_EMAC_DEBUG ppc64=n
+HIPPI all=y
+ROADRUNNER all=m
+ROADRUNNER_LARGE_RINGS all=n
+
+#-
+#- *** FILE: drivers/net/hyperv/Kconfig ***
+#-
+HYPERV_NET all=m
 
 #-
 #- *** FILE: drivers/net/irda/Kconfig ***
@@ -3117,26 +3668,12 @@ VLSI_FIR all=m sparc=n
 VIA_FIR all=m
 MCS_FIR all=m
 
-#-
-#- *** FILE: drivers/net/pcmcia/Kconfig ***
-#-
-NET_PCMCIA all=y
-PCMCIA_3C589 all=m
-PCMCIA_3C574 all=m
-PCMCIA_FMVJ18X all=m
-PCMCIA_PCNET all=m
-PCMCIA_NMCLAN all=m
-PCMCIA_SMC91C92 all=m
-PCMCIA_XIRC2PS all=m
-PCMCIA_AXNET all=m
-ARCNET_COM20020_CS all=m
-PCMCIA_IBMTR all=m ppc=n
-
 #-
 #- *** FILE: drivers/net/phy/Kconfig ***
 #-
 PHYLIB all=y
 #- MII PHY device drivers
+AMD_PHY all=m
 MARVELL_PHY all=m
 DAVICOM_PHY all=m
 QSEMI_PHY all=m
@@ -3155,24 +3692,50 @@ MICREL_PHY all=m
 FIXED_PHY all=y
 MDIO_BITBANG all=m
 MDIO_GPIO all=m
+MICREL_KS8995MA all=m
 
 #-
-#- *** FILE: drivers/net/sfc/Kconfig ***
+#- *** FILE: drivers/net/plip/Kconfig ***
 #-
-SFC all=m sparc=n
-SFC_MTD all=y
+PLIP all=m
 
 #-
-#- *** FILE: drivers/net/stmmac/Kconfig ***
+#- *** FILE: drivers/net/ppp/Kconfig ***
 #-
-STMMAC_ETH all=m
-STMMAC_DA all=y
-STMMAC_DUAL_MAC all=y
+PPP all=m
+PPP_BSDCOMP all=m
+PPP_DEFLATE all=m
+PPP_FILTER all=y
+PPP_MPPE all=m
+PPP_MULTILINK all=y
+PPPOATM all=m
+PPPOE all=m
+PPTP all=m
+PPPOL2TP all=m
+PPP_ASYNC all=m
+PPP_SYNC_TTY all=m
+
+#-
+#- *** FILE: drivers/net/slip/Kconfig ***
+#-
+SLIP all=m
+SLHC all=m
+SLIP_COMPRESSED all=y
+SLIP_SMART all=y
+SLIP_MODE_SLIP6 all=y
+
+#-
+#- *** FILE: drivers/net/team/Kconfig ***
+#-
+NET_TEAM all=m
+NET_TEAM_MODE_ROUNDROBIN all=m
+NET_TEAM_MODE_ACTIVEBACKUP all=m
 
 #-
 #- *** FILE: drivers/net/tokenring/Kconfig ***
 #-
 TR all=y sparc=n
+PCMCIA_IBMTR all=m ppc=n
 IBMTR alpha=m i386=m
 IBMOL all=m sparc=
 IBMLS i386=m ppc=n
@@ -3185,23 +3748,6 @@ ABYSS all=m sparc=
 MADGEMC all=m
 SMCTR all=m
 
-#-
-#- *** FILE: drivers/net/tulip/Kconfig ***
-#-
-NET_TULIP all=y
-DE2104X all=m
-DE2104X_DSL all=0
-TULIP all=m
-TULIP_MWI all=n
-TULIP_MMIO all=n
-TULIP_NAPI all=y
-TULIP_NAPI_HW_MITIGATION all=y
-DE4X5 all=m
-WINBOND_840 all=m
-DM9102 all=m
-ULI526X all=m
-PCMCIA_XIRCOM all=m
-
 #-
 #- *** FILE: drivers/net/usb/Kconfig ***
 #-
@@ -3233,6 +3779,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
@@ -3315,6 +3862,7 @@ MWL8K all=m
 #- file drivers/net/wireless/ath/Kconfig goes here
 #- file drivers/net/wireless/b43/Kconfig goes here
 #- file drivers/net/wireless/b43legacy/Kconfig goes here
+#- file drivers/net/wireless/brcm80211/Kconfig goes here
 #- file drivers/net/wireless/hostap/Kconfig goes here
 #- file drivers/net/wireless/ipw2x00/Kconfig goes here
 #- file drivers/net/wireless/iwlwifi/Kconfig goes here
@@ -3338,6 +3886,7 @@ 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/ath5k/Kconfig ***
@@ -3346,14 +3895,23 @@ ATH5K all=m
 ATH5K_DEBUG all=n
 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_LEGACY_RATE_CONTROL all=y
 ATH9K_HTC all=m
 ATH9K_HTC_DEBUGFS all=y
 
@@ -3362,6 +3920,7 @@ ATH9K_HTC_DEBUGFS all=y
 #-
 CARL9170 all=m
 CARL9170_LEDS all=y
+CARL9170_HWRNG all=y
 
 #-
 #- *** FILE: drivers/net/wireless/b43/Kconfig ***
@@ -3372,6 +3931,7 @@ B43_PCMCIA all=y
 B43_SDIO all=y
 B43_PHY_N all=y
 B43_PHY_LP all=y
+B43_PHY_HT all=y
 B43_DEBUG all=n
 
 #-
@@ -3383,6 +3943,14 @@ B43LEGACY_DMA_AND_PIO_MODE all=y
 B43LEGACY_DMA_MODE all=n
 B43LEGACY_PIO_MODE all=n
 
+#-
+#- *** FILE: drivers/net/wireless/brcm80211/Kconfig ***
+#-
+BRCMUTIL all=m
+BRCMSMAC all=m
+BRCMFMAC all=n
+BRCMDBG all=n
+
 #-
 #- *** FILE: drivers/net/wireless/hostap/Kconfig ***
 #-
@@ -3410,21 +3978,19 @@ LIBIPW_DEBUG all=n
 #-
 #- *** FILE: drivers/net/wireless/iwlegacy/Kconfig ***
 #-
-IWLWIFI_LEGACY all=m
-IWLWIFI_LEGACY_DEBUG all=n
-IWLWIFI_LEGACY_DEVICE_TRACING all=n
 IWL4965 all=m
 IWL3945 all=m
+IWLEGACY_DEBUG all=n
 
 #-
 #- *** FILE: drivers/net/wireless/iwlwifi/Kconfig ***
 #-
-IWLAGN all=m
+IWLWIFI all=m
 IWLWIFI_DEBUG all=y
 IWLWIFI_DEBUG_EXPERIMENTAL_UCODE all=y
 IWLWIFI_DEVICE_TRACING all=n
-IWLWIFI_DEVICE_SVTOOL all=y
-IWL_P2P all=n
+IWLWIFI_P2P all=y
+IWLWIFI_EXPERIMENTAL_MFP all=n
 
 #-
 #- *** FILE: drivers/net/wireless/iwmc3200wifi/Kconfig ***
@@ -3449,6 +4015,7 @@ LIBERTAS_MESH all=y
 #-
 MWIFIEX all=m
 MWIFIEX_SDIO all=m
+MWIFIEX_PCIE all=m
 
 #-
 #- *** FILE: drivers/net/wireless/orinoco/Kconfig ***
@@ -3507,6 +4074,7 @@ RTL8192CE all=m
 RTL8192SE all=m
 RTL8192DE all=m
 RTL8192CU all=m
+RTLWIFI_DEBUG all=n
 RTL8192C_COMMON all=m
 
 #-
@@ -3521,10 +4089,8 @@ WL1251_SDIO all=m
 #-
 WL12XX_MENU all=m
 WL12XX all=m
-WL12XX_HT all=y
 WL12XX_SPI all=m
 WL12XX_SDIO all=m
-WL12XX_SDIO_TEST all=m
 
 #-
 #- *** FILE: drivers/net/wireless/zd1211rw/Kconfig ***
@@ -3537,6 +4103,7 @@ ZD1211RW_DEBUG all=n
 #-
 PN544_NFC all=m
 NFC_PN533 all=m
+NFC_WILINK all=m
 
 #-
 #- *** FILE: drivers/parisc/Kconfig ***
@@ -3568,9 +4135,14 @@ 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
 PCI_IOV all=y
+PCI_PRI all=y
+PCI_PASID all=y
+PCI_IOAPIC all=m
 PCI_LABEL all=y
 
 #-
@@ -3598,6 +4170,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 ***
@@ -3646,6 +4221,8 @@ DELL_WMI all=m
 DELL_WMI_AIO all=m
 FUJITSU_LAPTOP all=m
 FUJITSU_LAPTOP_DEBUG all=n
+FUJITSU_TABLET all=m
+AMILO_RFKILL all=m
 TC1100_WMI all=m
 HP_ACCEL all=m
 HP_WMI all=m
@@ -3670,14 +4247,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
@@ -3685,6 +4260,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 ***
@@ -3726,9 +4302,10 @@ 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_BQ20Z75 all=m
+BATTERY_SBS all=m
 BATTERY_BQ27x00 all=m
 BATTERY_BQ27X00_I2C all=y
 BATTERY_BQ27X00_PLATFORM all=y
@@ -3739,7 +4316,11 @@ CHARGER_PCF50633 all=m
 BATTERY_INTEL_MID all=m
 CHARGER_ISP1704 all=m
 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 ***
@@ -3756,6 +4337,7 @@ PPS_DEBUG all=n
 PPS_CLIENT_KTIMER all=m
 PPS_CLIENT_LDISC all=m
 PPS_CLIENT_PARPORT all=m
+PPS_CLIENT_GPIO all=m
 
 #-
 #- *** FILE: drivers/ptp/Kconfig ***
@@ -3763,14 +4345,21 @@ PPS_CLIENT_PARPORT 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 ***
 #-
+#- file drivers/rapidio/devices/Kconfig goes here
 RAPIDIO_DISC_TIMEOUT all=30
 RAPIDIO_ENABLE_RX_TX_PORTS all=y
-#- file drivers/rapidio/switches/Kconfig goes here
 RAPIDIO_DEBUG all=n
+#- file drivers/rapidio/switches/Kconfig goes here
+
+#-
+#- *** FILE: drivers/rapidio/devices/Kconfig ***
+#-
+RAPIDIO_TSI721 all=y
 
 #-
 #- *** FILE: drivers/rapidio/switches/Kconfig ***
@@ -3786,37 +4375,40 @@ 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
-REGULATOR_BQ24022 all=m
+REGULATOR_GPIO 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_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 ***
@@ -3870,6 +4462,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
@@ -3920,7 +4513,7 @@ CHR_DEV_SG all=m
 CHR_DEV_SCH all=m
 SCSI_ENCLOSURE all=m
 SCSI_MULTI_LUN all=y
-SCSI_CONSTANTS all=n
+SCSI_CONSTANTS all=y
 SCSI_LOGGING all=y
 SCSI_SCAN_ASYNC all=y
 SCSI_WAIT_SCAN all=m
@@ -3953,17 +4546,19 @@ SCSI_AIC7XXX_OLD all=m
 #- file drivers/scsi/aic7xxx/Kconfig.aic79xx goes here
 #- file drivers/scsi/aic94xx/Kconfig goes here
 #- file drivers/scsi/mvsas/Kconfig goes here
+SCSI_MVUMI all=m
 SCSI_DPT_I2O all=m
 SCSI_ADVANSYS all=m
 SCSI_IN2000 alpha=m i386=m
 SCSI_ARCMSR all=m sparc=n
-SCSI_ARCMSR_AER all=y
 #- 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
@@ -4039,6 +4634,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
@@ -4161,6 +4757,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 ***
 #-
@@ -4208,17 +4809,13 @@ SSB_DEBUG all=n
 #- *** FILE: drivers/staging/Kconfig ***
 #-
 STAGING all=y
+#- file drivers/staging/serial/Kconfig goes here
 #- file drivers/staging/et131x/Kconfig goes here
 #- file drivers/staging/slicoss/Kconfig goes here
-#- file drivers/staging/go7007/Kconfig goes here
-#- file drivers/staging/cx25821/Kconfig goes here
-#- file drivers/staging/tm6000/Kconfig goes here
-#- file drivers/staging/cxd2099/Kconfig goes here
 #- file drivers/staging/usbip/Kconfig goes here
 #- file drivers/staging/winbond/Kconfig goes here
 #- file drivers/staging/wlan-ng/Kconfig goes here
 #- file drivers/staging/echo/Kconfig goes here
-#- file drivers/staging/brcm80211/Kconfig goes here
 #- file drivers/staging/comedi/Kconfig goes here
 #- file drivers/staging/olpc_dcon/Kconfig goes here
 #- file drivers/staging/asus_oled/Kconfig goes here
@@ -4228,78 +4825,61 @@ STAGING all=y
 #- 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/pohmelfs/Kconfig goes here
 #- file drivers/staging/phison/Kconfig goes here
 #- file drivers/staging/line6/Kconfig goes here
-#- file drivers/gpu/drm/vmwgfx/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/spectra/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
-#- file drivers/staging/dt3155v4l/Kconfig goes here
 #- file drivers/staging/crystalhd/Kconfig goes here
 #- file drivers/staging/cxt1e1/Kconfig goes here
 #- file drivers/staging/xgifb/Kconfig goes here
-#- file drivers/staging/lirc/Kconfig goes here
-#- file drivers/staging/easycap/Kconfig goes here
-#- file drivers/staging/solo6x10/Kconfig goes here
 #- file drivers/staging/tidspbridge/Kconfig goes here
 #- file drivers/staging/quickstart/Kconfig goes here
 #- file drivers/staging/sbe-2t3e3/Kconfig goes here
-#- file drivers/staging/ath6kl/Kconfig goes here
 #- file drivers/staging/keucr/Kconfig goes here
 #- file drivers/staging/bcm/Kconfig goes here
 #- file drivers/staging/ft1000/Kconfig goes here
-#- file drivers/staging/intel_sst/Kconfig goes here
 #- file drivers/staging/speakup/Kconfig goes here
 #- file drivers/staging/cptm1217/Kconfig goes here
 #- file drivers/staging/ste_rmi4/Kconfig goes here
-#- file drivers/staging/gma500/Kconfig goes here
-#- file drivers/staging/altera-stapl/Kconfig goes here
 #- file drivers/staging/mei/Kconfig goes here
 #- file drivers/staging/nvec/Kconfig goes here
+#- 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/altera-stapl/Kconfig ***
+#- *** FILE: drivers/staging/android/Kconfig ***
 #-
-ALTERA_STAPL all=m
+ANDROID all=n
+#- file drivers/staging/android/switch/Kconfig goes here
 
 #-
 #- *** FILE: drivers/staging/asus_oled/Kconfig ***
 #-
 ASUS_OLED all=m
 
-#-
-#- *** FILE: drivers/staging/ath6kl/Kconfig ***
-#-
-ATH6K_LEGACY all=n
-
 #-
 #- *** FILE: drivers/staging/bcm/Kconfig ***
 #-
 BCM_WIMAX all=m
 
-#-
-#- *** FILE: drivers/staging/brcm80211/Kconfig ***
-#-
-BRCMUTIL all=m
-BRCMSMAC all=m
-BRCMFMAC all=n
-BRCMDBG all=n
-
 #-
 #- *** FILE: drivers/staging/comedi/Kconfig ***
 #-
@@ -4423,6 +5003,7 @@ COMEDI_USB_DRIVERS all=m
 COMEDI_DT9812 all=m
 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
@@ -4439,35 +5020,12 @@ TOUCHSCREEN_CLEARPAD_TM1217 all=m
 #-
 CRYSTALHD all=m
 
-#-
-#- *** FILE: drivers/staging/cx25821/Kconfig ***
-#-
-VIDEO_CX25821 all=m
-VIDEO_CX25821_ALSA all=m
-
-#-
-#- *** FILE: drivers/staging/cxd2099/Kconfig ***
-#-
-DVB_CXD2099 all=m
-
 #-
 #- *** FILE: drivers/staging/cxt1e1/Kconfig ***
 #-
 CXT1E1 all=m
 SBE_PMCC4_NCOMM all=y
 
-#-
-#- *** FILE: drivers/staging/dt3155v4l/Kconfig ***
-#-
-VIDEO_DT3155 all=m
-DT3155_CCIR all=y
-
-#-
-#- *** FILE: drivers/staging/easycap/Kconfig ***
-#-
-EASYCAP all=m
-EASYCAP_DEBUG all=n
-
 #-
 #- *** FILE: drivers/staging/echo/Kconfig ***
 #-
@@ -4477,7 +5035,6 @@ ECHO all=m
 #- *** FILE: drivers/staging/et131x/Kconfig ***
 #-
 ET131X all=m
-ET131X_DEBUG all=n
 
 #-
 #- *** FILE: drivers/staging/frontier/Kconfig ***
@@ -4491,40 +5048,11 @@ FT1000 all=m
 FT1000_USB all=m
 FT1000_PCMCIA all=m
 
-#-
-#- *** FILE: drivers/staging/gma500/Kconfig ***
-#-
-DRM_PSB all=m
-
-#-
-#- *** FILE: drivers/staging/go7007/Kconfig ***
-#-
-VIDEO_GO7007 all=m
-VIDEO_GO7007_USB all=m
-VIDEO_GO7007_USB_S2250_BOARD all=m
-VIDEO_GO7007_OV7640 all=m
-VIDEO_GO7007_SAA7113 all=m
-VIDEO_GO7007_SAA7115 all=m
-VIDEO_GO7007_TW9903 all=m
-VIDEO_GO7007_UDA1342 all=m
-VIDEO_GO7007_SONY_TUNER all=m
-VIDEO_GO7007_TW2804 all=m
-
-#-
-#- *** FILE: drivers/staging/hv/Kconfig ***
-#-
-HYPERV all=m
-HYPERV_STORAGE all=m
-HYPERV_BLOCK all=m
-HYPERV_NET all=m
-HYPERV_UTILS all=m
-HYPERV_MOUSE all=m
-
 #-
 #- *** FILE: drivers/staging/iio/Kconfig ***
 #-
 IIO all=m
-IIO_RING_BUFFER all=y
+IIO_ST_HWMON all=m
 IIO_SW_RING all=m
 IIO_KFIFO_BUF all=m
 IIO_TRIGGER all=y
@@ -4532,20 +5060,24 @@ IIO_CONSUMERS_PER_TRIGGER all=2
 #- file drivers/staging/iio/accel/Kconfig goes here
 #- 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/dds/Kconfig goes here
 #- file drivers/staging/iio/gyro/Kconfig goes here
+#- file drivers/staging/iio/impedance-analyzer/Kconfig goes here
 #- file drivers/staging/iio/imu/Kconfig goes here
 #- file drivers/staging/iio/light/Kconfig goes here
 #- file drivers/staging/iio/magnetometer/Kconfig goes here
 #- file drivers/staging/iio/meter/Kconfig goes here
 #- file drivers/staging/iio/resolver/Kconfig goes here
 #- file drivers/staging/iio/trigger/Kconfig goes here
+IIO_SIMPLE_DUMMY all=m
+IIO_SIMPLE_DUMMY_EVENTS all=y
+IIO_SIMPLE_DUMMY_BUFFER all=y
 
 #-
 #- *** FILE: drivers/staging/iio/accel/Kconfig ***
 #-
-#- Accelerometers
 ADIS16201 all=m
 ADIS16203 all=m
 ADIS16204 all=m
@@ -4561,12 +5093,8 @@ SCA3000 all=m
 #-
 #- *** FILE: drivers/staging/iio/adc/Kconfig ***
 #-
-#- Analog to digital convertors
-AD7150 all=m
-AD7152 all=m
 AD7291 all=m
 AD7298 all=m
-AD7314 all=m
 AD7606 all=m
 AD7606_IFACE_PARALLEL all=m
 AD7606_IFACE_SPI all=m
@@ -4575,29 +5103,39 @@ AD7476 all=m
 AD7887 all=m
 AD7780 all=m
 AD7793 all=m
-AD7745 all=m
 AD7816 all=m
-ADT75 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 ***
 #-
-#- Analog digital bi-direction convertors
 ADT7316 all=m
 ADT7316_SPI all=m
 ADT7316_I2C all=m
 
+#-
+#- *** FILE: drivers/staging/iio/cdc/Kconfig ***
+#-
+AD7150 all=m
+AD7152 all=m
+AD7746 all=m
+
 #-
 #- *** FILE: drivers/staging/iio/dac/Kconfig ***
 #-
-#- Digital to analog convertors
+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
@@ -4605,7 +5143,6 @@ MAX517 all=m
 #-
 #- *** FILE: drivers/staging/iio/dds/Kconfig ***
 #-
-#- Direct Digital Synthesis
 AD5930 all=m
 AD9832 all=m
 AD9834 all=m
@@ -4617,23 +5154,25 @@ AD9951 all=m
 #-
 #- *** FILE: drivers/staging/iio/gyro/Kconfig ***
 #-
-#- Digital gyroscope sensors
 ADIS16060 all=m
 ADIS16080 all=m
 ADIS16130 all=m
 ADIS16260 all=m
 ADXRS450 all=m
 
+#-
+#- *** FILE: drivers/staging/iio/impedance-analyzer/Kconfig ***
+#-
+AD5933 all=m
+
 #-
 #- *** FILE: drivers/staging/iio/imu/Kconfig ***
 #-
-#- Inertial measurement units
 ADIS16400 all=m
 
 #-
 #- *** FILE: drivers/staging/iio/light/Kconfig ***
 #-
-#- Light sensors
 SENSORS_ISL29018 all=m
 SENSORS_TSL2563 all=m
 TSL2583 all=m
@@ -4641,14 +5180,12 @@ TSL2583 all=m
 #-
 #- *** FILE: drivers/staging/iio/magnetometer/Kconfig ***
 #-
-#- Magnetometer sensors
 SENSORS_AK8975 all=m
 SENSORS_HMC5843 all=m
 
 #-
 #- *** FILE: drivers/staging/iio/meter/Kconfig ***
 #-
-#- Active energy metering IC
 ADE7753 all=m
 ADE7754 all=m
 ADE7758 all=m
@@ -4660,9 +5197,8 @@ ADE7854_SPI all=m
 #-
 #- *** FILE: drivers/staging/iio/resolver/Kconfig ***
 #-
-#- Resolver to digital converters
 AD2S90 all=m
-AD2S120X all=m
+AD2S1200 all=m
 AD2S1210 all=m
 
 #-
@@ -4673,12 +5209,6 @@ IIO_PERIODIC_RTC_TRIGGER all=m
 IIO_GPIO_TRIGGER all=m
 IIO_SYSFS_TRIGGER all=m
 
-#-
-#- *** FILE: drivers/staging/intel_sst/Kconfig ***
-#-
-SND_INTEL_SST all=m
-SND_INTELMID all=n
-
 #-
 #- *** FILE: drivers/staging/keucr/Kconfig ***
 #-
@@ -4696,7 +5226,56 @@ LINE6_USB_RAW all=n
 LINE6_USB_IMPULSE_RESPONSE all=n
 
 #-
-#- *** FILE: drivers/staging/lirc/Kconfig ***
+#- *** FILE: drivers/staging/media/Kconfig ***
+#-
+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
+
+#-
+#- *** FILE: drivers/staging/media/as102/Kconfig ***
+#-
+DVB_AS102 all=m
+
+#-
+#- *** FILE: drivers/staging/media/cxd2099/Kconfig ***
+#-
+DVB_CXD2099 all=m
+
+#-
+#- *** FILE: drivers/staging/media/dt3155v4l/Kconfig ***
+#-
+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 ***
+#-
+VIDEO_GO7007 all=m
+VIDEO_GO7007_USB all=m
+VIDEO_GO7007_USB_S2250_BOARD all=m
+VIDEO_GO7007_OV7640 all=m
+VIDEO_GO7007_SAA7113 all=m
+VIDEO_GO7007_SAA7115 all=m
+VIDEO_GO7007_TW9903 all=m
+VIDEO_GO7007_UDA1342 all=m
+VIDEO_GO7007_SONY_TUNER all=m
+VIDEO_GO7007_TW2804 all=m
+
+#-
+#- *** FILE: drivers/staging/media/lirc/Kconfig ***
 #-
 LIRC_STAGING all=y
 LIRC_BT829 all=m
@@ -4710,11 +5289,21 @@ LIRC_SIR all=m
 LIRC_TTUSBIR all=m
 LIRC_ZILOG all=m
 
+#-
+#- *** FILE: drivers/staging/media/solo6x10/Kconfig ***
+#-
+SOLO6X10 all=m
+
 #-
 #- *** FILE: drivers/staging/mei/Kconfig ***
 #-
 INTEL_MEI all=m
 
+#-
+#- *** FILE: drivers/staging/ozwpan/Kconfig ***
+#-
+USB_WPAN_HCD all=m
+
 #-
 #- *** FILE: drivers/staging/panel/Kconfig ***
 #-
@@ -4728,13 +5317,6 @@ PANEL_CHANGE_MESSAGE all=n
 #-
 IDE_PHISON all=m
 
-#-
-#- *** FILE: drivers/staging/pohmelfs/Kconfig ***
-#-
-POHMELFS all=m
-POHMELFS_DEBUG all=n
-POHMELFS_CRYPTO all=y
-
 #-
 #- *** FILE: drivers/staging/quatech_usb2/Kconfig ***
 #-
@@ -4753,6 +5335,15 @@ R8187SE all=m
 #-
 #- *** FILE: drivers/staging/rtl8192e/Kconfig ***
 #-
+RTLLIB all=m
+RTLLIB_CRYPTO_CCMP all=m
+RTLLIB_CRYPTO_TKIP all=m
+RTLLIB_CRYPTO_WEP all=m
+#- file drivers/staging/rtl8192e/rtl8192e/Kconfig goes here
+
+#-
+#- *** FILE: drivers/staging/rtl8192e/rtl8192e/Kconfig ***
+#-
 RTL8192E all=m
 
 #-
@@ -4764,7 +5355,12 @@ RTL8192U all=m
 #- *** FILE: drivers/staging/rtl8712/Kconfig ***
 #-
 R8712U all=m
-R8712_AP all=y
+
+#-
+#- *** FILE: drivers/staging/rts5139/Kconfig ***
+#-
+RTS5139 all=m
+RTS5139_DEBUG all=n
 
 #-
 #- *** FILE: drivers/staging/rts_pstor/Kconfig ***
@@ -4797,11 +5393,6 @@ SLICOSS all=m
 #-
 FB_SM7XX all=m
 
-#-
-#- *** FILE: drivers/staging/solo6x10/Kconfig ***
-#-
-SOLO6X10 all=m
-
 #-
 #- *** FILE: drivers/staging/speakup/Kconfig ***
 #-
@@ -4822,25 +5413,17 @@ SPEAKUP_SYNTH_SPKOUT all=m
 SPEAKUP_SYNTH_TXPRT all=m
 SPEAKUP_SYNTH_DUMMY all=m
 
-#-
-#- *** FILE: drivers/staging/spectra/Kconfig ***
-#-
-SPECTRA all=m
-SPECTRA_MRST_HW all=n
-SPECTRA_MTD all=y
-SPECTRA_EMU all=n
-
 #-
 #- *** FILE: drivers/staging/ste_rmi4/Kconfig ***
 #-
 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 all=m
 
 #-
-#- *** FILE: drivers/staging/tm6000/Kconfig ***
+#- *** FILE: drivers/staging/telephony/Kconfig ***
 #-
-VIDEO_TM6000 all=m
-VIDEO_TM6000_ALSA all=m
-VIDEO_TM6000_DVB all=m
+PHONE all=m
+PHONE_IXJ all=m
+PHONE_IXJ_PCMCIA all=m
 
 #-
 #- *** FILE: drivers/staging/usbip/Kconfig ***
@@ -4876,6 +5459,7 @@ VME_TSI148 all=m
 #-
 #- VME Device Drivers
 VME_USER all=m
+VME_PIO2 all=m
 
 #-
 #- *** FILE: drivers/staging/vt6655/Kconfig ***
@@ -4915,12 +5499,11 @@ FB_XGI all=m
 #-
 #- *** FILE: drivers/staging/zcache/Kconfig ***
 #-
-ZCACHE all=m
+ZCACHE all=y
 
 #-
 #- *** FILE: drivers/staging/zram/Kconfig ***
 #-
-XVMALLOC all=y
 ZRAM all=m
 ZRAM_DEBUG all=n
 
@@ -4950,13 +5533,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 ***
 #-
@@ -4995,14 +5571,15 @@ 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
 
 #-
-#- *** FILE: drivers/tty/serial/Kconfig ***
+#- *** FILE: drivers/tty/serial/8250/Kconfig ***
 #-
 SERIAL_8250 all=y
 SERIAL_8250_CONSOLE all=y
@@ -5022,10 +5599,14 @@ SERIAL_8250_SHARE_IRQ all=y
 SERIAL_8250_DETECT_IRQ all=y
 SERIAL_8250_RSA all=y
 SERIAL_8250_MCA i386=m
+
+#-
+#- *** FILE: drivers/tty/serial/Kconfig ***
+#-
+#- file drivers/tty/serial/8250/Kconfig goes here
 #- Non-8250 serial port support
 SERIAL_MAX3100 all=m
 SERIAL_MAX3107 all=m
-SERIAL_MAX3107_AAVA all=m
 SERIAL_MRST_MAX3110 all=m
 SERIAL_MFD_HSU all=m
 SERIAL_UARTLITE all=m
@@ -5077,12 +5658,13 @@ 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
 #- file drivers/usb/mon/Kconfig goes here
 #- file drivers/usb/wusbcore/Kconfig goes here
 #- file drivers/usb/host/Kconfig goes here
@@ -5124,13 +5706,19 @@ USB_DEBUG all=n
 USB_ANNOUNCE_NEW_DEVICES all=y
 #- Miscellaneous USB options
 USB_DEVICEFS all=y
-USB_DEVICE_CLASS all=y sparc64=n
+USB_DEVICE_CLASS all=n
 USB_DYNAMIC_MINORS all=y sparc64=n
 USB_SUSPEND all=y
 USB_OTG all=n
 USB_OTG_WHITELIST all=y
 USB_OTG_BLACKLIST_HUB all=n
 
+#-
+#- *** FILE: drivers/usb/dwc3/Kconfig ***
+#-
+USB_DWC3 all=m
+USB_DWC3_DEBUG all=n
+
 #-
 #- *** FILE: drivers/usb/gadget/Kconfig ***
 #-
@@ -5139,7 +5727,10 @@ USB_GADGET_DEBUG all=n
 USB_GADGET_DEBUG_FILES all=n
 USB_GADGET_DEBUG_FS all=n
 USB_GADGET_VBUS_DRAW all=2
+USB_GADGET_STORAGE_NUM_BUFFERS all=2
 USB_R8A66597 all=m
+USB_RENESAS_USBHS_UDC all=m
+USB_MV_UDC all=m
 USB_GADGET_MUSB_HDRC all=n
 USB_M66592 all=m
 USB_AMD5536UDC all=m
@@ -5154,6 +5745,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
@@ -5171,6 +5763,7 @@ USB_MIDI_GADGET all=m
 USB_G_PRINTER all=m
 USB_CDC_COMPOSITE all=m
 USB_G_NOKIA all=m
+USB_G_ACM_MS all=m
 USB_G_MULTI all=m
 USB_G_MULTI_RNDIS all=y
 USB_G_MULTI_CDC all=y
@@ -5193,6 +5786,7 @@ USB_EHCI_TT_NEWSCHED all=y
 USB_EHCI_BIG_ENDIAN_MMIO all=n ppc64=y
 USB_EHCI_FSL ppc=y
 USB_EHCI_HCD_PPC_OF ppc=y ppc64=y
+USB_EHCI_MV all=y
 USB_OXU210HP_HCD all=m
 USB_ISP116X_HCD all=m
 USB_ISP1760_HCD all=m
@@ -5204,6 +5798,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
@@ -5213,6 +5809,7 @@ USB_SL811_HCD all=m
 USB_SL811_HCD_ISO all=y
 USB_SL811_CS all=m
 USB_R8A66597_HCD all=m
+USB_RENESAS_USBHS_HCD all=m
 USB_WHCI_HCD all=m
 USB_HWA_HCD all=m
 
@@ -5271,8 +5868,13 @@ USB_MUSB_HDRC all=n
 USB_GPIO_VBUS all=m
 TWL4030_USB all=m
 NOP_USB_XCEIV all=m
-USB_LANGWELL_OTG all=m
 AB8500_USB all=m
+USB_MV_OTG all=m
+
+#-
+#- *** FILE: drivers/usb/renesas_usbhs/Kconfig ***
+#-
+USB_RENESAS_USBHS all=m
 
 #-
 #- *** FILE: drivers/usb/serial/Kconfig ***
@@ -5296,6 +5898,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
@@ -5316,6 +5919,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
@@ -5351,6 +5955,7 @@ USB_SERIAL_DEBUG all=m
 USB_STORAGE all=m
 USB_STORAGE_DEBUG all=n
 USB_STORAGE_REALTEK all=m
+REALTEK_AUTOPM all=y
 USB_STORAGE_DATAFAB all=m
 USB_STORAGE_FREECOM all=m
 USB_STORAGE_ISD200 all=m
@@ -5449,6 +6054,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
@@ -5503,11 +6109,13 @@ FB_FSL_DIU ppc=m
 FB_TMIO all=m
 FB_TMIO_ACCELL all=y
 FB_SM501 all=m
+FB_SMSCUFX all=m
 FB_UDL all=m
 FB_IBM_GXT4500 ppc=m ppc64=m
 FB_PS3 ppc64=y
 FB_PS3_DEFAULT_SIZE_M ppc64=18
 FB_VIRTUAL all=n
+XEN_FBDEV_FRONTEND all=m
 FB_METRONOME all=m
 FB_MB862XX all=m
 FB_MB862XX_PCI_GDC all=y
@@ -5515,8 +6123,8 @@ 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/display/Kconfig goes here
 #- file drivers/video/console/Kconfig goes here
 #- file drivers/video/logo/Kconfig goes here
 
@@ -5539,12 +6147,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 ***
@@ -5570,10 +6181,9 @@ FONT_SUN12x22 ppc=n ppc64=n sparc=y sparc64=y
 FONT_10x18 all=n
 
 #-
-#- *** FILE: drivers/video/display/Kconfig ***
+#- *** FILE: drivers/video/exynos/Kconfig ***
 #-
-DISPLAY_SUPPORT all=m
-#- Display hardware drivers
+EXYNOS_VIDEO all=n
 
 #-
 #- *** FILE: drivers/video/geode/Kconfig ***
@@ -5605,6 +6215,7 @@ VIRTIO all=m
 VIRTIO_RING all=m
 VIRTIO_PCI all=m
 VIRTIO_BALLOON all=m
+VIRTIO_MMIO all=m
 
 #-
 #- *** FILE: drivers/w1/Kconfig ***
@@ -5635,12 +6246,14 @@ 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
 
 #-
 #- *** FILE: drivers/watchdog/Kconfig ***
 #-
 WATCHDOG all=y
+WATCHDOG_CORE all=y
 WATCHDOG_NOWAYOUT all=n
 #- Watchdog Device Drivers
 SOFT_WATCHDOG all=m
@@ -5677,6 +6290,7 @@ SBC7240_WDT all=m
 CPU5_WDT i386=m x86_64=m
 SMSC_SCH311X_WDT all=m
 SMSC37B787_WDT i386=m x86_64=m
+VIA_WDT all=m
 W83627HF_WDT i386=m x86_64=m
 W83697HF_WDT i386=m x86_64=m
 W83697UG_WDT i386=m x86_64=m
@@ -5688,6 +6302,7 @@ MPC5200_WDT ppc=m
 WATCHDOG_RTAS ppc=m ppc64=m
 WATCHDOG_CP1XXX sparc64=m
 WATCHDOG_RIO sparc64=m
+XEN_WDT all=m
 #- ISA-based Watchdog Cards
 PCWATCHDOG alpha=m i386=m
 MIXCOMWD alpha=m i386=m
@@ -5698,6 +6313,23 @@ WDTPCI all=m
 #- USB-based Watchdog Cards
 USBPCWATCHDOG all=m
 
+#-
+#- *** FILE: drivers/xen/Kconfig ***
+#-
+XEN_BALLOON all=y
+XEN_SELFBALLOONING all=y
+XEN_BALLOON_MEMORY_HOTPLUG all=y
+XEN_SCRUB_PAGES all=y
+XEN_DEV_EVTCHN all=m
+XEN_BACKEND all=y
+XENFS all=m
+XEN_COMPAT_XENFS all=y
+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 ***
 #-
@@ -5764,12 +6396,14 @@ 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
 #- file fs/ufs/Kconfig goes here
 #- file fs/exofs/Kconfig goes here
 #- file fs/aufs/Kconfig goes here
+#- file fs/exofs/Kconfig.ore goes here
 NETWORK_FILESYSTEMS all=y
 #- file fs/nfs/Kconfig goes here
 #- file fs/nfsd/Kconfig goes here
@@ -5784,7 +6418,6 @@ NFS_COMMON all=y
 #- file fs/coda/Kconfig goes here
 #- file fs/afs/Kconfig goes here
 #- file fs/9p/Kconfig goes here
-#- file fs/partitions/Kconfig goes here
 #- file fs/nls/Kconfig goes here
 #- file fs/dlm/Kconfig goes here
 
@@ -5842,6 +6475,7 @@ BFS_FS all=m
 #-
 BTRFS_FS all=m
 BTRFS_FS_POSIX_ACL all=y
+BTRFS_FS_CHECK_INTEGRITY all=n
 
 #-
 #- *** FILE: fs/cachefiles/Kconfig ***
@@ -6064,7 +6698,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 ***
@@ -6074,6 +6707,7 @@ NFSD_V2_ACL all=y
 NFSD_V3 all=y
 NFSD_V3_ACL all=y
 NFSD_V4 all=y
+NFSD_FAULT_INJECTION all=n
 
 #-
 #- *** FILE: fs/nilfs2/Kconfig ***
@@ -6162,35 +6796,6 @@ OCFS2_DEBUG_FS all=n
 #-
 OMFS_FS all=m
 
-#-
-#- *** FILE: fs/partitions/Kconfig ***
-#-
-PARTITION_ADVANCED all=y
-ACORN_PARTITION all=y
-ACORN_PARTITION_CUMANA all=y
-ACORN_PARTITION_EESOX all=y
-ACORN_PARTITION_ICS all=y
-ACORN_PARTITION_ADFS all=y
-ACORN_PARTITION_POWERTEC all=y
-ACORN_PARTITION_RISCIX all=y
-OSF_PARTITION all=y
-AMIGA_PARTITION all=y
-ATARI_PARTITION all=y
-MAC_PARTITION all=y
-MSDOS_PARTITION all=y
-BSD_DISKLABEL all=y
-MINIX_SUBPARTITION all=y
-SOLARIS_X86_PARTITION all=y
-UNIXWARE_DISKLABEL all=y
-LDM_PARTITION all=y
-LDM_DEBUG all=n
-SGI_PARTITION all=y
-ULTRIX_PARTITION all=y
-SUN_PARTITION all=y
-KARMA_PARTITION all=y
-EFI_PARTITION all=y
-SYSV68_PARTITION all=y
-
 #-
 #- *** FILE: fs/proc/Kconfig ***
 #-
@@ -6208,6 +6813,12 @@ PSTORE all=y
 #-
 QNX4FS_FS all=m
 
+#-
+#- *** FILE: fs/qnx6/Kconfig ***
+#-
+QNX6FS_FS all=m
+QNX6FS_DEBUG all=n
+
 #-
 #- *** FILE: fs/quota/Kconfig ***
 #-
@@ -6243,6 +6854,7 @@ SQUASHFS_XATTR all=y
 SQUASHFS_ZLIB all=y
 SQUASHFS_LZO all=y
 SQUASHFS_XZ all=y
+SQUASHFS_4K_DEVBLK_SIZE all=y
 SQUASHFS_EMBEDDED all=n
 
 #-
@@ -6317,16 +6929,16 @@ TASK_DELAY_ACCT all=y
 TASK_XACCT all=y
 TASK_IO_ACCOUNTING all=y
 AUDIT all=y
-AUDITSYSCALL all=y
+AUDITSYSCALL all=n
+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
 IKCONFIG all=m
 IKCONFIG_PROC all=y
-LOG_BUF_SHIFT all=16
+LOG_BUF_SHIFT all=18
 CGROUPS all=y
 CGROUP_DEBUG all=n
 CGROUP_FREEZER all=y
@@ -6338,16 +6950,18 @@ RESOURCE_COUNTERS 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
+CFS_BANDWIDTH all=y
 RT_GROUP_SCHED all=n
 BLK_CGROUP all=y
 DEBUG_BLK_CGROUP all=n
 NAMESPACES all=y
 UTS_NS all=y
 IPC_NS all=y
-USER_NS all=n
+USER_NS all=y
 PID_NS all=y
 NET_NS all=y
 SCHED_AUTOGROUP all=y
@@ -6457,18 +7071,21 @@ HIGH_RES_TIMERS all=y alpha= ia64=
 EVENT_POWER_TRACING_DEPRECATED all=y
 CONTEXT_SWITCH_TRACER all=y
 FTRACE all=y
-FUNCTION_TRACER all=n
+FUNCTION_TRACER all=y
+FUNCTION_GRAPH_TRACER all=y
 IRQSOFF_TRACER all=n
-SCHED_TRACER all=n
+SCHED_TRACER all=y
 ENABLE_DEFAULT_TRACERS all=n
-FTRACE_SYSCALLS all=n
+FTRACE_SYSCALLS all=y
 TRACE_BRANCH_PROFILING all=n
 BRANCH_PROFILE_NONE all=y
 PROFILE_ANNOTATED_BRANCHES all=n
 PROFILE_ALL_BRANCHES all=n
-STACK_TRACER all=n
+STACK_TRACER all=y
 BLK_DEV_IO_TRACE all=n
 KPROBE_EVENT all=y
+DYNAMIC_FTRACE all=y
+FUNCTION_PROFILER all=y
 FTRACE_STARTUP_TEST all=n
 MMIOTRACE x86=n
 RING_BUFFER_BENCHMARK all=m
@@ -6482,6 +7099,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
@@ -6546,6 +7168,7 @@ DEBUG_LOCK_ALLOC all=n
 PROVE_LOCKING all=n
 SPARSE_RCU_POINTER all=n
 LOCK_STAT all=n
+DEBUG_ATOMIC_SLEEP all=n
 DEBUG_LOCKING_API_SELFTESTS all=n
 DEBUG_STACK_USAGE all=n
 DEBUG_KOBJECT all=n
@@ -6562,9 +7185,11 @@ DEBUG_SG all=n
 DEBUG_NOTIFIERS all=n
 DEBUG_CREDENTIALS all=n
 FRAME_POINTER i386=y x86_64=y
-BOOT_PRINTK_DELAY all=n
+BOOT_PRINTK_DELAY all=y
 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
@@ -6574,7 +7199,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
@@ -6706,7 +7330,9 @@ BRIDGE_NETFILTER all=y
 #- file net/dcb/Kconfig goes here
 #- file net/dns_resolver/Kconfig goes here
 #- file net/batman-adv/Kconfig goes here
+#- file net/openvswitch/Kconfig goes here
 RFS_ACCEL all=y
+NETPRIO_CGROUP all=m
 HAVE_BPF_JIT all=y
 BPF_JIT all=y
 NET_PKTGEN all=m
@@ -6760,8 +7386,6 @@ BATMAN_ADV_DEBUG all=n
 #- *** FILE: net/bluetooth/Kconfig ***
 #-
 BT all=m
-BT_L2CAP all=y
-BT_SCO all=y
 #- file net/bluetooth/rfcomm/Kconfig goes here
 #- file net/bluetooth/bnep/Kconfig goes here
 #- file net/bluetooth/cmtp/Kconfig goes here
@@ -6829,6 +7453,7 @@ BRIDGE_EBT_NFLOG=m
 CAIF all=m
 CAIF_DEBUG all=n
 CAIF_NETDEV all=m
+CAIF_USB all=m
 
 #-
 #- *** FILE: net/can/Kconfig ***
@@ -6836,6 +7461,7 @@ CAIF_NETDEV all=m
 CAN all=m
 CAN_RAW all=m
 CAN_BCM all=m
+CAN_GW all=m
 #- file drivers/net/can/Kconfig goes here
 
 #-
@@ -6843,6 +7469,7 @@ CAN_BCM all=m
 #-
 CEPH_LIB all=m
 CEPH_LIB_PRETTYDEBUG all=n
+CEPH_LIB_USE_DNS_RESOLVER all=y
 
 #-
 #- *** FILE: net/dcb/Kconfig ***
@@ -6881,9 +7508,6 @@ DECNET_NF_GRABULATOR all=m
 #- *** FILE: net/dsa/Kconfig ***
 #-
 NET_DSA all=y
-NET_DSA_MV88E6060 all=y
-NET_DSA_MV88E6131 all=y
-NET_DSA_MV88E6123_61_65 all=y
 
 #-
 #- *** FILE: net/econet/Kconfig ***
@@ -6896,6 +7520,7 @@ ECONET_NATIVE all=y
 #- *** FILE: net/ieee802154/Kconfig ***
 #-
 IEEE802154 all=m
+IEEE802154_6LOWPAN all=m
 
 #-
 #- *** FILE: net/ipv4/Kconfig ***
@@ -6932,6 +7557,7 @@ INET_XFRM_MODE_BEET all=m
 INET_LRO all=y
 INET_DIAG all=m
 INET_TCP_DIAG all=m
+INET_UDP_DIAG all=m
 TCP_CONG_ADVANCED all=y
 TCP_CONG_BIC all=m
 TCP_CONG_CUBIC all=y
@@ -6963,10 +7589,10 @@ IP_NF_QUEUE all=m
 IP_NF_IPTABLES all=m
 IP_NF_MATCH_AH all=m
 IP_NF_MATCH_ECN all=m
+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
@@ -7023,9 +7649,9 @@ IP6_NF_MATCH_OPTS all=m
 IP6_NF_MATCH_HL all=m
 IP6_NF_MATCH_IPV6HEADER all=m
 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
@@ -7108,13 +7734,16 @@ MAC80211_DEBUG_MENU all=n
 #-
 #- *** FILE: net/netfilter/Kconfig ***
 #-
+NETFILTER_NETLINK_ACCT all=m
 NETFILTER_NETLINK_QUEUE all=m
 NETFILTER_NETLINK_LOG all=m
 NF_CONNTRACK all=m
 NF_CONNTRACK_MARK all=y
 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
@@ -7130,8 +7759,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
@@ -7148,6 +7777,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
@@ -7182,6 +7812,7 @@ NETFILTER_XT_MATCH_LIMIT all=m
 NETFILTER_XT_MATCH_MAC all=m
 NETFILTER_XT_MATCH_MARK all=m
 NETFILTER_XT_MATCH_MULTIPORT all=m
+NETFILTER_XT_MATCH_NFACCT all=m
 NETFILTER_XT_MATCH_OSF all=m
 NETFILTER_XT_MATCH_OWNER all=m
 NETFILTER_XT_MATCH_POLICY all=m
@@ -7244,6 +7875,7 @@ IP_VS_DH all=m
 IP_VS_SH all=m
 IP_VS_SED all=m
 IP_VS_NQ all=m
+IP_VS_SH_TAB_BITS all=8
 IP_VS_FTP all=m
 IP_VS_NFCT all=y
 IP_VS_PE_SIP all=m
@@ -7257,8 +7889,25 @@ NETLABEL all=y
 #- *** FILE: net/nfc/Kconfig ***
 #-
 NFC all=m
+#- file net/nfc/nci/Kconfig goes here
+#- file net/nfc/llcp/Kconfig goes here
 #- file drivers/nfc/Kconfig goes here
 
+#-
+#- *** FILE: net/nfc/llcp/Kconfig ***
+#-
+NFC_LLCP all=y
+
+#-
+#- *** FILE: net/nfc/nci/Kconfig ***
+#-
+NFC_NCI all=m
+
+#-
+#- *** FILE: net/openvswitch/Kconfig ***
+#-
+OPENVSWITCH all=m
+
 #-
 #- *** FILE: net/packet/Kconfig ***
 #-
@@ -7315,6 +7964,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
@@ -7367,6 +8017,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 ***
@@ -7379,6 +8030,7 @@ TIPC_DEBUG all=n
 #- *** FILE: net/unix/Kconfig ***
 #-
 UNIX all=y
+UNIX_DIAG all=m
 
 #-
 #- *** FILE: net/wanrouter/Kconfig ***
@@ -7440,16 +8092,19 @@ SECURITY all=y
 SECURITY_NETWORK all=y
 SECURITY_NETWORK_XFRM all=y
 SECURITY_PATH all=y
+INTEL_TXT all=y
 LSM_MMAP_MIN_ADDR all=0 x86_64=65536 i386=65536 sparc64=8192 ppc=65536
 #- file security/selinux/Kconfig goes here
 #- file security/smack/Kconfig goes here
 #- file security/tomoyo/Kconfig goes here
 #- file security/apparmor/Kconfig goes here
-#- file security/integrity/ima/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=""
 
@@ -7458,7 +8113,6 @@ DEFAULT_SECURITY all=""
 #-
 SECURITY_APPARMOR=y
 SECURITY_APPARMOR_BOOTPARAM_VALUE=1
-SECURITY_APPARMOR_COMPAT_24=y
 
 #-
 #- *** FILE: security/integrity/ima/Kconfig ***
@@ -7486,6 +8140,16 @@ SECURITY_SMACK all=y
 #- *** FILE: security/tomoyo/Kconfig ***
 #-
 SECURITY_TOMOYO all=y
+SECURITY_TOMOYO_MAX_ACCEPT_ENTRY all=2048
+SECURITY_TOMOYO_MAX_AUDIT_LOG all=1024
+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 ***
@@ -7749,6 +8413,7 @@ SND_YMFPCI all=m
 #- *** FILE: sound/pci/hda/Kconfig ***
 #-
 SND_HDA_INTEL all=m sparc=n
+SND_HDA_PREALLOC_SIZE all=2048
 SND_HDA_HWDEP all=y
 SND_HDA_RECONFIG all=y
 SND_HDA_INPUT_BEEP all=y
@@ -7756,6 +8421,7 @@ SND_HDA_INPUT_BEEP_MODE all=2
 SND_HDA_INPUT_JACK all=y
 SND_HDA_PATCH_LOADER all=y
 SND_HDA_CODEC_REALTEK all=y
+SND_HDA_ENABLE_REALTEK_QUIRKS all=y
 SND_HDA_CODEC_ANALOG all=y
 SND_HDA_CODEC_SIGMATEL all=y
 SND_HDA_CODEC_VIA all=y
@@ -7763,6 +8429,7 @@ SND_HDA_CODEC_HDMI all=y
 SND_HDA_CODEC_CIRRUS all=y
 SND_HDA_CODEC_CONEXANT all=y
 SND_HDA_CODEC_CA0110 all=y
+SND_HDA_CODEC_CA0132 all=y
 SND_HDA_CODEC_CMEDIA all=y
 SND_HDA_CODEC_SI3054 all=y
 SND_HDA_GENERIC all=y
@@ -7789,7 +8456,6 @@ SND_PS3_DEFAULT_START_DELAY ppc64=2000
 #- *** FILE: sound/soc/Kconfig ***
 #-
 SND_SOC all=m
-SND_SOC_CACHE_LZO all=y
 #- file sound/soc/atmel/Kconfig goes here
 #- file sound/soc/au1x/Kconfig goes here
 #- file sound/soc/blackfin/Kconfig goes here
@@ -7802,6 +8468,7 @@ SND_SOC_CACHE_LZO all=y
 #- file sound/soc/omap/Kconfig goes here
 #- file sound/soc/kirkwood/Kconfig goes here
 #- file sound/soc/mid-x86/Kconfig goes here
+#- file sound/soc/mxs/Kconfig goes here
 #- file sound/soc/pxa/Kconfig goes here
 #- file sound/soc/samsung/Kconfig goes here
 #- file sound/soc/s6000/Kconfig goes here
@@ -7820,7 +8487,6 @@ SND_SOC_DFBMCS320 all=m
 SND_SOC_MAX98095 all=m
 SND_SOC_MAX9850 all=m
 SND_SOC_SGTL5000 all=m
-SND_SOC_TVL320AIC32X4 all=m
 SND_SOC_WM1250_EV1 all=m
 SND_SOC_WM8991 all=m
 SND_SOC_LM4857 all=m
@@ -7875,38 +8541,122 @@ 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
 AD2S1210_GPIO_OUTPUT all=n
+AD7314 all=m
+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
 CRYPTO_LZF all=m
 CS5535_GPIO i386=m
 DEBUG_SPINLOCK_SLEEP all=n
 DIGIEPCA all=m
+DISPLAY_SUPPORT all=m
+DRM_PSB all=m
+DRM_PSB_CDV all=y
+DRM_PSB_MFLD all=y
+DRM_PSB_MRST all=y
+EARLY_PRINTK_MRST all=n
 EASYCAP_OSS all=n
 EASYCAP_SND all=y
+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
+IBM_NEW_EMAC ppc64=m
+IBM_NEW_EMAC_DEBUG ppc64=n
+IBM_NEW_EMAC_POLL_WEIGHT ppc64=32
+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
+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
+IWLWIFI_LEGACY all=m
+IWLWIFI_LEGACY_DEBUG all=n
+IWLWIFI_LEGACY_DEVICE_TRACING all=n
+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
+MISC_DEVICES all=y
 MMC_SDHCI_OF powerpc=m
+MTD_DEBUG all=n
 MYRI_SBUS sparc=m sparc64=m
+NETDEV_1000 all=y
+NETDEV_10000 all=y
+NET_ETHERNET all=y
+NET_ISA alpha=y i386=y
+NET_PCI all=y
+NET_PCMCIA all=y
+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
+SND_INTEL_SST all=m
+SND_SOC_CACHE_LZO all=y
+SND_SOC_TVL320AIC32X4 all=m
 SND_SOC_WM8915 all=m
 SPECIALIX all=m
+SPECTRA all=m
+SPECTRA_EMU all=n
+SPECTRA_MRST_HW all=n
+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
 USB_GADGET_CI13XXX_PCI all=n
 USB_GADGET_DUMMY_HCD all=y
+USB_GADGET_DWC3 all=m
 USB_GADGET_EG20T all=n
 USB_GADGET_FSL_USB2 all=n
 USB_GADGET_FUSB300 all=n
@@ -7919,3 +8669,8 @@ USB_GADGET_PXA_U2O all=n
 USB_GADGET_R8A66597 all=n
 USB_GADGET_S3C2410 all=n
 USB_GADGET_SELECTED all=y
+USB_LANGWELL_OTG all=m
+WL12XX_HT all=y
+WL12XX_SDIO_TEST all=m
+XEN_PLATFORM_PCI all=m
+XVMALLOC all=y