- disable user namespace; it's broken right now and will be fixed in some distinct...

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

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index c24c8f1c4188b150a2a5825fe94a83bdcddc7b1f..ae79be4890bcbe565e891140243d15fba5aadfbf 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -1,4 +1,23 @@
 
+#-
+#- *** FILE: arch/* - ARCH SPECIFIC OPTIONS ***
+#-
+AMD_NUMA all=y
+CPU_SUP_AMD all=y
+CPU_SUP_CENTAUR all=y
+CPU_SUP_INTEL all=y
+DEBUG_SET_MODULE_RONX all=y
+DEBUG_STRICT_USER_COPY_CHECKS all=n
+DMI all=y
+EARLY_PRINTK_MRST all=n
+GART_IOMMU all=y
+KEYS_COMPAT all=y
+KVM_MMU_AUDIT all=y
+OPTPROBES all=y
+PHYSICAL_START all=0x1000000
+PROCESSOR_SELECT all=y
+RAPIDIO all=y
+
 #-
 #- *** FILE: block/Kconfig ***
 #-
@@ -6,18 +25,16 @@ BLOCK all=y
 LBDAF i386=y ppc=y sparc=y sparc64=
 BLK_DEV_BSG all=y
 BLK_DEV_INTEGRITY all=y
+BLK_DEV_THROTTLING all=y
 #- file block/Kconfig.iosched goes here
 
 #-
 #- *** FILE: block/Kconfig.iosched ***
 #-
 IOSCHED_NOOP all=y
-IOSCHED_AS all=y
 IOSCHED_DEADLINE all=y
 IOSCHED_CFQ all=y
 CFQ_GROUP_IOSCHED all=y
-# DEBUG_CFQ_IOSCHED is not set
-DEFAULT_AS all=n
 DEFAULT_DEADLINE all=n
 DEFAULT_CFQ all=y
 DEFAULT_NOOP all=n
@@ -35,8 +52,10 @@ CRYPTO_AEAD all=m
 CRYPTO_BLKCIPHER all=m
 CRYPTO_HASH all=y
 CRYPTO_MANAGER all=y
+CRYPTO_MANAGER_DISABLE_TESTS all=y
 CRYPTO_GF128MUL all=m
 CRYPTO_NULL all=m
+CRYPTO_PCRYPT all=m
 CRYPTO_CRYPTD all=m
 CRYPTO_AUTHENC all=m
 CRYPTO_TEST all=m
@@ -72,6 +91,7 @@ CRYPTO_SHA256 all=y
 CRYPTO_SHA512 all=m
 CRYPTO_TGR192 all=m
 CRYPTO_WP512 all=m
+CRYPTO_GHASH_CLMUL_NI_INTEL all=m
 #- Ciphers
 CRYPTO_AES all=m
 CRYPTO_AES_586 i386=m
@@ -100,8 +120,11 @@ CRYPTO_TWOFISH_X86_64 x86_64=m
 CRYPTO_DEFLATE all=m
 CRYPTO_ZLIB all=m
 CRYPTO_LZO all=m
+CRYPTO_LZF all=m
 #- Random Number Generation
 CRYPTO_ANSI_CPRNG all=m
+CRYPTO_USER_API_HASH all=m
+CRYPTO_USER_API_SKCIPHER all=m
 #- file drivers/crypto/Kconfig goes here
 
 #-
@@ -117,8 +140,7 @@ ACPI ia64=y x86=y
 ACPI_SLEEP x86=y
 ACPI_PROCFS all=y
 ACPI_PROCFS_POWER ia64=y x86=y
-ACPI_POWER_METER all=m
-ACPI_SYSFS_POWER ia64=y x86=y
+ACPI_EC_DEBUGFS all=m
 ACPI_PROC_EVENT all=y
 ACPI_AC x86=m
 ACPI_BATTERY x86=m
@@ -127,6 +149,7 @@ ACPI_VIDEO x86=m
 ACPI_FAN all=m
 ACPI_DOCK all=y
 ACPI_PROCESSOR all=m
+ACPI_IPMI all=m
 ACPI_HOTPLUG_CPU all=y
 ACPI_PROCESSOR_AGGREGATOR all=m
 ACPI_THERMAL all=m
@@ -140,6 +163,18 @@ X86_PM_TIMER x86=y
 ACPI_CONTAINER all=m
 ACPI_HOTPLUG_MEMORY all=m
 ACPI_SBS x86=m
+ACPI_HED all=m
+ACPI_CUSTOM_METHOD all=m
+#- file drivers/acpi/apei/Kconfig goes here
+
+#-
+#- *** FILE: drivers/acpi/apei/Kconfig ***
+#-
+ACPI_APEI all=y
+ACPI_APEI_GHES all=m
+ACPI_APEI_PCIEAER all=y
+ACPI_APEI_EINJ all=m
+ACPI_APEI_ERST_DEBUG all=m
 
 #-
 #- *** FILE: drivers/ata/Kconfig ***
@@ -149,78 +184,89 @@ ATA_NONSTANDARD all=n ia64=y ppc64=y
 ATA_VERBOSE_ERROR all=y
 ATA_ACPI all=y
 SATA_PMP all=y sparc=n
+#- Controllers with non-SFF native interface
 SATA_AHCI all=m sparc=n
-SATA_SIL24 all=m sparc=n
+SATA_AHCI_PLATFORM all=m
 SATA_FSL ppc=m
+SATA_INIC162X all=m
+SATA_ACARD_AHCI all=m
+SATA_SIL24 all=m sparc=n
 ATA_SFF all=y sparc=n
-SATA_SVW all=m sparc=n
+#- SFF controllers with custom DMA interface
+PDC_ADMA all=m sparc=n
+SATA_QSTOR all=m sparc=n
+SATA_SX4 all=m sparc=n
+ATA_BMDMA all=y
+#- SATA SFF controllers with BMDMA
 ATA_PIIX all=m sparc=n
 SATA_MV all=m sparc=n
 SATA_NV all=m sparc=n
-PDC_ADMA all=m sparc=n
-SATA_QSTOR all=m sparc=n
 SATA_PROMISE all=m sparc=n
-SATA_SX4 all=m sparc=n
 SATA_SIL all=m sparc=n
 SATA_SIS all=m sparc=n
+SATA_SVW all=m sparc=n
 SATA_ULI all=m sparc=n
 SATA_VIA all=m sparc=n
 SATA_VITESSE all=m sparc=n
-SATA_INIC162X all=m
-PATA_ACPI i386=m ia64=m x86_64=m
+#- PATA SFF controllers with BMDMA
 PATA_ALI all=m sparc=n
 PATA_AMD all=m sparc=n
+PATA_ARASAN_CF all=m
 PATA_ARTOP all=m sparc=n
-PATA_ATP867X all=m
 PATA_ATIIXP all=m sparc=n
-PATA_CMD640_PCI all=m sparc=n
+PATA_ATP867X all=m
 PATA_CMD64X all=m sparc=n
 PATA_CS5520 all=m sparc=n
 PATA_CS5530 all=m sparc=n
 PATA_CS5535 i386=m
-PATA_CS5536 i386=m
+PATA_CS5536 all=m
 PATA_CYPRESS all=m sparc=n
 PATA_EFAR all=m sparc=n
-ATA_GENERIC all=m sparc=n
 PATA_HPT366 all=m sparc=n
 PATA_HPT37X all=m sparc=n
 PATA_HPT3X2N all=m sparc=n
 PATA_HPT3X3 all=m sparc=n
 PATA_HPT3X3_DMA all=y sparc=
-PATA_ISAPNP alpha=m i386=m
-PATA_IT821X all=m sparc=n
 PATA_IT8213 all=m
+PATA_IT821X all=m sparc=n
 PATA_JMICRON all=m sparc=n
-PATA_LEGACY alpha=m i386=m
-PATA_TRIFLEX all=m sparc=n
 PATA_MARVELL all=m sparc=n
 PATA_MPC52xx ppc=m
-PATA_MPIIX all=m sparc=n
-PATA_OLDPIIX all=m sparc=n
 PATA_NETCELL all=m sparc=n
 PATA_NINJA32 all=m
-PATA_NS87410 all=m sparc=n
 PATA_NS87415 all=m
-PATA_OPTI all=m sparc=n
+PATA_OLDPIIX all=m sparc=n
 PATA_OPTIDMA all=m sparc=n
-PATA_PCMCIA all=m
+PATA_PDC2027X all=m sparc=n
 PATA_PDC_OLD all=m sparc=n
-PATA_QDI alpha=m i386=m
 PATA_RADISYS all=m sparc=n
 PATA_RDC all=m
-PATA_RZ1000 all=m sparc=n
 PATA_SC1200 all=m sparc=n
+PATA_SCC ppc64=m
+PATA_SCH all=m sparc=n
 PATA_SERVERWORKS all=m sparc=n
-PATA_PDC2027X all=m sparc=n
 PATA_SIL680 all=m sparc=n
 PATA_SIS all=m sparc=n
+PATA_TOSHIBA all=m
+PATA_TRIFLEX all=m sparc=n
 PATA_VIA all=m sparc=n
 PATA_WINBOND all=m sparc=n
-PATA_WINBOND_VLB all=m sparc=n
-PATA_PLATFORM ppc=m ppc64=m
+#- PIO-only SFF controllers
+PATA_CMD640_PCI all=m sparc=n
+PATA_ISAPNP alpha=m i386=m
+PATA_MPIIX all=m sparc=n
+PATA_NS87410 all=m sparc=n
+PATA_OPTI all=m sparc=n
+PATA_PCMCIA all=m
+PATA_PLATFORM all=m
 PATA_OF_PLATFORM ppc=m ppc64=m
-PATA_SCC ppc64=m
-PATA_SCH all=m sparc=n
+PATA_QDI alpha=m i386=m
+PATA_RZ1000 all=m sparc=n
+PATA_WINBOND_VLB all=m sparc=n
+#- Generic fallback / legacy drivers
+PATA_ACPI i386=m ia64=m x86_64=m
+ATA_GENERIC all=m sparc=n
+PATA_LEGACY all=m
 
 #-
 #- *** FILE: drivers/atm/Kconfig ***
@@ -235,9 +281,9 @@ ATM_ENI_TUNE_BURST all=n
 ATM_FIRESTREAM all=m sparc64=n
 ATM_ZATM all=m sparc64=n
 ATM_ZATM_DEBUG all=n
-ATM_NICSTAR i386=m ppc=n
-ATM_NICSTAR_USE_SUNI i386=y
-ATM_NICSTAR_USE_IDT77105 i386=y
+ATM_NICSTAR all=m
+ATM_NICSTAR_USE_SUNI all=y
+ATM_NICSTAR_USE_IDT77105 all=y
 ATM_IDT77252 all=m sparc=n
 ATM_IDT77252_DEBUG all=n
 ATM_IDT77252_RCV_ALL all=n
@@ -280,6 +326,15 @@ DEBUG_DRIVER all=n
 DEBUG_DEVRES all=n
 SYS_HYPERVISOR all=n
 
+#-
+#- *** FILE: drivers/bcma/Kconfig ***
+#-
+BCMA_POSSIBLE all=y
+BCMA all=m
+BCMA_HOST_PCI_POSSIBLE all=y
+BCMA_HOST_PCI all=y
+BCMA_DEBUG all=n
+
 #-
 #- *** FILE: drivers/block/Kconfig ***
 #-
@@ -297,6 +352,7 @@ BLK_DEV_UMEM all=m
 BLK_DEV_COW_COMMON all=n
 BLK_DEV_LOOP all=m
 BLK_DEV_CRYPTOLOOP all=n
+#- file drivers/block/drbd/Kconfig goes here
 BLK_DEV_NBD all=m
 BLK_DEV_OSD all=m
 BLK_DEV_SX8 all=m
@@ -313,6 +369,14 @@ SUNVDC sparc64=m
 #- file drivers/s390/block/Kconfig goes here
 VIRTIO_BLK all=m
 BLK_DEV_HD all=n
+BLK_DEV_RBD all=m
+
+#-
+#- *** FILE: drivers/block/drbd/Kconfig ***
+#-
+#- DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+BLK_DEV_DRBD all=m
+DRBD_FAULT_INJECTION all=n
 
 #-
 #- *** FILE: drivers/block/paride/Kconfig ***
@@ -349,6 +413,7 @@ BT_HCIBTSDIO all=m
 BT_HCIUART all=m
 BT_HCIUART_H4 all=y
 BT_HCIUART_BCSP all=y
+BT_HCIUART_ATH3K all=y
 BT_HCIUART_LL all=y
 BT_HCIBCM203X all=m
 BT_HCIBPA10X all=m
@@ -360,58 +425,26 @@ BT_HCIBTUART all=m
 BT_HCIVHCI all=m
 BT_MRVL all=m
 BT_MRVL_SDIO all=m
+BT_ATH3K all=m
+BT_WILINK all=m
 
 #-
 #- *** FILE: drivers/char/Kconfig ***
 #-
-VT all=y
-VT_CONSOLE all=y
-HW_CONSOLE all=y
-VT_HW_CONSOLE_BINDING all=y
+#- file drivers/tty/Kconfig goes here
 DEVKMEM all=y
-SERIAL_NONSTANDARD all=y
-COMPUTONE all=m
-ROCKETPORT all=m
-CYCLADES all=m
-CYZ_INTR all=n
-DIGIEPCA all=m
-ESPSERIAL alpha=m i386=m
-MOXA_INTELLIO all=m
-MOXA_SMARTIO all=m
-ISI all=m
-SYNCLINK all=m
-SYNCLINKMP all=m
-SYNCLINK_GT all=m
-N_HDLC all=m
-RISCOM8 all=m
-SPECIALIX all=m
-SX all=m
-RIO all=m
-RIO_OLDPCI all=n ia64=y ppc=y ppc64=y
 STALDRV all=y
-STALLION all=m
-ISTALLION all=m
-NOZOMI all=m
 SGI_SNSC ia64=y
 SGI_TIOCX ia64=y
 SGI_MBCS ia64=m
-#- file drivers/serial/Kconfig goes here
-UNIX98_PTYS all=y
-DEVPTS_MULTIPLE_INSTANCES all=y
-LEGACY_PTYS all=y
-LEGACY_PTY_COUNT all=256
+#- 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
-HVC_DRIVER ppc64=y
-HVC_CONSOLE ppc64=n
-HVC_ISERIES ppc64=n
-HVC_RTAS ppc=y ppc64=y
-HVC_BEAT ppc64=n
-HVC_UDBG all=n
+#- file drivers/tty/hvc/Kconfig goes here
 VIRTIO_CONSOLE all=m
-HVCS ppc64=n
 IBM_BSR ppc64=m
 #- file drivers/char/ipmi/Kconfig goes here
 #- file drivers/char/hw_random/Kconfig goes here
@@ -430,7 +463,6 @@ MWAVE i386=m x86_64=m
 SCx200_GPIO i386=m
 PC8736x_GPIO i386=m x86_64=m
 NSC_GPIO i386=m x86_64=m
-CS5535_GPIO i386=m
 RAW_DRIVER all=m
 MAX_RAW_DEVS all=1024
 HPET all=y
@@ -441,6 +473,7 @@ MMTIMER ia64=m
 TELCLOCK i386=m x86_64=m
 DEVPORT all=y
 #- file drivers/s390/char/Kconfig goes here
+RAMOOPS all=m
 
 #-
 #- *** FILE: drivers/char/agp/Kconfig ***
@@ -507,7 +540,7 @@ TCG_INFINEON all=m
 #-
 #- *** FILE: drivers/connector/Kconfig ***
 #-
-CONNECTOR all=m
+CONNECTOR all=y
 PROC_EVENTS all=y
 
 #-
@@ -515,18 +548,19 @@ PROC_EVENTS all=y
 #-
 CPU_FREQ all=y
 CPU_FREQ_TABLE all=m ppc=y ppc64=y
-CPU_FREQ_DEBUG all=n
 CPU_FREQ_STAT all=m
 CPU_FREQ_STAT_DETAILS all=y
-CPU_FREQ_DEFAULT_GOV_PERFORMANCE all=y alpha=
-CPU_FREQ_DEFAULT_GOV_USERSPACE all=n alpha=
-CPU_FREQ_DEFAULT_GOV_ONDEMAND all=n alpha=
-CPU_FREQ_DEFAULT_GOV_CONSERVATIVE all=n alpha=
+CPU_FREQ_DEFAULT_GOV_PERFORMANCE all=y
+CPU_FREQ_DEFAULT_GOV_POWERSAVE all=n
+CPU_FREQ_DEFAULT_GOV_USERSPACE all=n
+CPU_FREQ_DEFAULT_GOV_ONDEMAND all=n
+CPU_FREQ_DEFAULT_GOV_CONSERVATIVE all=n
 CPU_FREQ_GOV_PERFORMANCE all=y
 CPU_FREQ_GOV_POWERSAVE all=m
 CPU_FREQ_GOV_USERSPACE all=m
 CPU_FREQ_GOV_ONDEMAND all=m
 CPU_FREQ_GOV_CONSERVATIVE all=m
+#- file drivers/cpufreq/Kconfig.x86 goes here
 
 #-
 #- *** FILE: drivers/cpuidle/Kconfig ***
@@ -543,15 +577,20 @@ CRYPTO_DEV_PADLOCK_SHA all=m
 CRYPTO_DEV_GEODE i386=m
 CRYPTO_DEV_HIFN_795X all=m
 CRYPTO_DEV_HIFN_795X_RNG all=y
+#- file drivers/crypto/caam/Kconfig goes here
 CRYPTO_DEV_TALITOS all=m
 
 #-
 #- *** FILE: drivers/dma/Kconfig ***
 #-
 DMADEVICES all=y
+DMADEVICES_DEBUG all=n
 #- DMA Devices
+INTEL_MID_DMAC all=m
 INTEL_IOATDMA i386=m x86_64=m
 FSL_DMA ppc=y ppc64=y
+TIMB_DMA all=m
+PCH_DMA all=m
 DMA_ENGINE all=y
 #- DMA Clients
 NET_DMA all=y
@@ -565,6 +604,7 @@ EDAC all=y
 #- Reporting subsystems
 EDAC_DEBUG all=n
 EDAC_DECODE_MCE all=m
+EDAC_MCE_INJ all=m
 EDAC_MM_EDAC all=m
 EDAC_AMD64 x86_64=m
 EDAC_AMD64_ERROR_INJECTION x86_64=y
@@ -577,10 +617,12 @@ EDAC_I3000 i386=m x86_64=m
 EDAC_I3200 all=m
 EDAC_X38 i386=m x86_64=m
 EDAC_I5400 all=m
+EDAC_I7CORE all=m
 EDAC_I82860 i386=m
 EDAC_R82600 i386=m
 EDAC_I5000 i386=m x86_64=m
 EDAC_I5100 i386=m x86_64=m
+EDAC_I7300 all=m
 EDAC_PASEMI ppc64=m
 EDAC_CELL ppc64=m
 EDAC_AMD8131 powerpc=m
@@ -597,25 +639,35 @@ EISA_NAMES alpha=y i386=y
 #-
 #- *** FILE: drivers/firewire/Kconfig ***
 #-
-#- You can enable one or both FireWire driver stacks.
-#- See the help texts for more information.
 FIREWIRE all=n ia64=m ppc=m ppc64=m x86_64=m
 FIREWIRE_OHCI all=m
 FIREWIRE_SBP2 all=m
 FIREWIRE_NET all=m
+FIREWIRE_NOSY all=m
 
 #-
 #- *** FILE: drivers/firmware/Kconfig ***
 #-
 EDD i386=m x86_64=m
 EDD_OFF all=n
+FIRMWARE_MEMMAP all=y
 EFI_VARS all=m
 EFI_PCDP ia64=y
 DELL_RBU i386=m x86_64=m
 DCDBAS i386=m x86_64=m
 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
+
+#-
+#- *** FILE: drivers/firmware/google/Kconfig ***
+#-
+GOOGLE_FIRMWARE all=y
+GOOGLE_SMI all=m
+GOOGLE_MEMCONSOLE all=m
 
 #-
 #- *** FILE: drivers/gpio/Kconfig ***
@@ -623,23 +675,40 @@ ISCSI_IBFT all=m
 GPIOLIB all=y
 DEBUG_GPIO all=n
 GPIO_SYSFS all=y
-#- Memory mapped GPIO expanders:
+#- Memory mapped GPIO drivers:
+GPIO_BASIC_MMIO_CORE all=m
+GPIO_BASIC_MMIO all=m
+GPIO_IT8761E all=m
 GPIO_XILINX powerpc=y
+GPIO_SCH all=m
+GPIO_VX855 all=m
 #- I2C GPIO expanders:
+GPIO_MAX7300 all=m
 GPIO_MAX732X all=m
 GPIO_PCA953X all=m
 GPIO_PCF857X all=m
+GPIO_SX150X all=m
 GPIO_TWL4030 powerpc=m
 GPIO_WM831X all=m
+GPIO_WM8994 all=m
+GPIO_ADP5588 all=m
 #- PCI GPIO expanders:
+GPIO_CS5535 all=m
 GPIO_BT8XX all=m
 GPIO_LANGWELL all=n
+GPIO_PCH all=m
+GPIO_ML_IOH all=m
+GPIO_TIMBERDALE all=y
+GPIO_RDC321X all=m
 #- SPI GPIO expanders:
 GPIO_MAX7301 all=m
 GPIO_MCP23S08 all=m
 GPIO_MC33880 all=m
+GPIO_74X164 all=m
 #- AC97 GPIO expanders:
 GPIO_UCB1400 all=y
+#- MODULbus GPIO expanders:
+GPIO_JANZ_TTL all=m
 
 #-
 #- *** FILE: drivers/gpu/drm/Kconfig ***
@@ -648,8 +717,8 @@ DRM all=m
 DRM_TDFX all=m
 DRM_R128 all=m
 DRM_RADEON all=m
+#- file drivers/gpu/drm/radeon/Kconfig goes here
 DRM_I810 i386=m x86_64=m
-DRM_I830 i386=m x86_64=m
 DRM_I915 i386=m x86_64=m
 DRM_I915_KMS all=y
 DRM_MGA all=m
@@ -657,11 +726,37 @@ DRM_SIS all=m
 DRM_VIA all=m
 DRM_SAVAGE all=m
 
+#-
+#- *** FILE: drivers/gpu/drm/nouveau/Kconfig ***
+#-
+DRM_NOUVEAU all=m
+DRM_NOUVEAU_BACKLIGHT all=y
+DRM_NOUVEAU_DEBUG all=n
+DRM_I2C_CH7006 all=m
+DRM_I2C_SIL164 all=m
+
 #-
 #- *** FILE: drivers/gpu/drm/radeon/Kconfig ***
 #-
 DRM_RADEON_KMS all=y
 
+#-
+#- *** FILE: drivers/gpu/drm/vmwgfx/Kconfig ***
+#-
+DRM_VMWGFX all=m
+
+#-
+#- *** FILE: drivers/gpu/stub/Kconfig ***
+#-
+STUB_POULSBO all=m
+
+#-
+#- *** FILE: drivers/gpu/vga/Kconfig ***
+#-
+VGA_ARB all=y
+VGA_ARB_MAX_GPUS all=16
+VGA_SWITCHEROO all=y
+
 #-
 #- *** FILE: drivers/hid/Kconfig ***
 #-
@@ -669,14 +764,70 @@ HID_SUPPORT all=y
 HID all=m
 HIDRAW all=y
 #- file drivers/hid/usbhid/Kconfig goes here
+HID_A4TECH all=m
+HID_ACRUX all=m
+HID_ACRUX_FF all=m
+HID_APPLE all=m
+HID_BELKIN all=m
+HID_CHERRY all=m
+HID_CHICONY all=m
+HID_PRODIKEYS all=m
+HID_CYPRESS all=m
+HID_DRAGONRISE all=m
 DRAGONRISE_FF all=y
+HID_EMS_FF all=m
+HID_ELECOM all=m
+HID_EZKEY all=m
+HID_KEYTOUCH all=m
+HID_KYE all=m
+HID_UCLOGIC all=m
+HID_WALTOP all=m
+HID_GYRATION all=m
+HID_TWINHAN all=m
+HID_KENSINGTON all=m
+HID_LCPOWER all=m
+HID_LOGITECH all=m
 LOGITECH_FF all=y
 LOGIRUMBLEPAD2_FF all=y
+LOGIG940_FF all=y
+LOGIWII_FF all=y
+HID_MAGICMOUSE all=m
+HID_MICROSOFT all=m
+HID_MONTEREY all=m
+HID_MULTITOUCH all=m
+HID_NTRIG all=m
+HID_ORTEK all=m
+HID_PANTHERLORD all=m
 PANTHERLORD_FF all=y
+HID_PETALYNX all=m
+HID_PICOLCD all=m
+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_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_SAMSUNG all=m
+HID_SONY all=m
+HID_SUNPLUS all=m
+HID_GREENASIA all=m
 GREENASIA_FF all=y
+HID_SMARTJOYPLUS all=m
 SMARTJOYPLUS_FF all=y
+HID_TOPSEED all=m
+HID_THRUSTMASTER all=m
 THRUSTMASTER_FF all=y
+HID_WACOM all=m
+HID_WACOM_POWER_SUPPLY all=y
+HID_ZEROPLUS all=m
 ZEROPLUS_FF all=y
+HID_ZYDACRON all=m
 
 #-
 #- *** FILE: drivers/hid/usbhid/Kconfig ***
@@ -707,16 +858,17 @@ SENSORS_ADM1026 all=m
 SENSORS_ADM1029 all=m
 SENSORS_ADM1031 all=m
 SENSORS_ADM9240 all=m
+SENSORS_ADT7411 all=m
 SENSORS_ADT7462 all=m
 SENSORS_ADT7470 all=m
-SENSORS_ADT7473 all=m
 SENSORS_ADT7475 all=m
+SENSORS_ASC7621 all=m
 SENSORS_K8TEMP all=m
-SENSORS_AMS ppc=m
-SENSORS_AMS_PMU ppc=y
-SENSORS_AMS_I2C ppc=y
+SENSORS_K10TEMP all=m
+SENSORS_FAM15H_POWER all=m
 SENSORS_ASB100 all=m
 SENSORS_ATXP1 all=m
+SENSORS_DS620 all=m
 SENSORS_DS1621 all=m
 SENSORS_I5K_AMB all=m
 SENSORS_F71805F all=m
@@ -726,12 +878,16 @@ SENSORS_FSCHMD all=m
 SENSORS_G760A all=m
 SENSORS_GL518SM all=m
 SENSORS_GL520SM all=m
+SENSORS_GPIO_FAN all=m
 SENSORS_CORETEMP all=m
 SENSORS_IBMAEM all=m
 SENSORS_IBMPEX all=m
 SENSORS_IT87 all=m
+SENSORS_JC42 all=m
+SENSORS_LINEAGE all=m
 SENSORS_LM63 all=m
 SENSORS_LM70 all=m
+SENSORS_LM73 all=m
 SENSORS_LM75 all=m
 SENSORS_LM77 all=m
 SENSORS_LM78 all=m
@@ -742,25 +898,49 @@ SENSORS_LM87 all=m
 SENSORS_LM90 all=m
 SENSORS_LM92 all=m
 SENSORS_LM93 all=m
+SENSORS_LTC4151 all=m
 SENSORS_LTC4215 all=m
 SENSORS_LTC4245 all=m
+SENSORS_LTC4261 all=m
 SENSORS_LM95241 all=m
 SENSORS_MAX1111 all=m
+SENSORS_MAX16065 all=m
 SENSORS_MAX1619 all=m
+SENSORS_MAX6639 all=m
+SENSORS_MAX6642 all=m
 SENSORS_MAX6650 all=m
 SENSORS_PC87360 all=m
 SENSORS_PC87427 all=m
 SENSORS_PCF8591 all=m
+PMBUS all=m
+SENSORS_PMBUS all=m
+SENSORS_ADM1275 all=m
+SENSORS_MAX16064 all=m
+SENSORS_MAX34440 all=m
+SENSORS_MAX8688 all=m
+SENSORS_UCD9000 all=m
+SENSORS_UCD9200 all=m
 SENSORS_SHT15 all=m
+SENSORS_SHT21 all=m
 SENSORS_SIS5595 all=m
+SENSORS_SMM665 all=m
 SENSORS_DME1737 all=m
+SENSORS_EMC1403 all=m
+SENSORS_EMC2103 all=m
+SENSORS_EMC6W201 all=m
 SENSORS_SMSC47M1 all=m
 SENSORS_SMSC47M192 all=m
 SENSORS_SMSC47B397 all=m
+SENSORS_SCH5627 all=m
+SENSORS_ADS1015 all=m
 SENSORS_ADS7828 all=m
+SENSORS_ADS7871 all=m
+SENSORS_AMC6821 all=m
 SENSORS_THMC50 all=m
+SENSORS_TMP102 all=m
 SENSORS_TMP401 all=m
 SENSORS_TMP421 all=m
+SENSORS_VIA_CPUTEMP all=m
 SENSORS_VIA686A all=m
 SENSORS_VT1211 all=m
 SENSORS_VT8231 all=m
@@ -768,6 +948,8 @@ SENSORS_W83781D all=m
 SENSORS_W83791D all=m
 SENSORS_W83792D all=m
 SENSORS_W83793 all=m
+SENSORS_W83795 all=m
+SENSORS_W83795_FANCTRL all=n
 SENSORS_W83L785TS all=m
 SENSORS_W83L786NG all=m
 SENSORS_W83627HF all=m
@@ -775,12 +957,11 @@ SENSORS_W83627EHF all=m
 SENSORS_WM831X all=m
 SENSORS_WM8350 all=m
 SENSORS_ULTRA45 sparc64=m
-SENSORS_HDAPS all=m
-SENSORS_LIS3_SPI all=m
 SENSORS_APPLESMC all=m
+SENSORS_MC13783_ADC all=m
 #- ACPI drivers
+SENSORS_ACPI_POWER all=m
 SENSORS_ATK0110 all=m
-SENSORS_LIS3LV02D all=m
 
 #-
 #- *** FILE: drivers/i2c/Kconfig ***
@@ -789,14 +970,14 @@ I2C all=m ppc=y ppc64=y
 I2C_BOARDINFO all=y
 I2C_COMPAT all=y
 I2C_CHARDEV all=m
+I2C_MUX all=m
+#- file drivers/i2c/muxes/Kconfig goes here
 I2C_HELPER_AUTO all=y
 #- file drivers/i2c/algos/Kconfig goes here
 #- file drivers/i2c/busses/Kconfig goes here
-#- file drivers/i2c/chips/Kconfig goes here
 I2C_DEBUG_CORE all=n
 I2C_DEBUG_ALGO all=n
 I2C_DEBUG_BUS all=n
-I2C_DEBUG_CHIP all=n
 
 #-
 #- *** FILE: drivers/i2c/algos/Kconfig ***
@@ -834,21 +1015,24 @@ I2C_POWERMAC ppc=m ppc64=m
 #- I2C system bus drivers (mostly embedded / system-on-chip)
 I2C_DESIGNWARE powerpc=m
 I2C_GPIO all=m
+I2C_INTEL_MID all=m
 I2C_MPC ppc=n
 I2C_OCORES all=m
 I2C_PASEMI ppc64=m
+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
 I2C_PARPORT_LIGHT all=m
 I2C_TAOS_EVM all=m
 I2C_TINY_USB all=m
-#- Graphics adapter I2C/DDC channel drivers
-I2C_VOODOO3 all=m
 #- Other I2C/SMBus bus drivers
 I2C_ELEKTOR i386=m
 I2C_PCA_ISA all=m
-I2C_PCA_PLATFORM all=m
 I2C_STUB all=m
 SCx200_I2C i386=m
 SCx200_I2C_SCL i386=12
@@ -856,10 +1040,11 @@ SCx200_I2C_SDA i386=13
 SCx200_ACB i386=m
 
 #-
-#- *** FILE: drivers/i2c/chips/Kconfig ***
+#- *** FILE: drivers/i2c/muxes/Kconfig ***
 #-
-DS1682 all=m
-SENSORS_TSL2550 all=m
+I2C_MUX_GPIO all=m
+I2C_MUX_PCA9541 all=m
+I2C_MUX_PCA954x all=m
 
 #-
 #- *** FILE: drivers/ide/Kconfig ***
@@ -938,26 +1123,9 @@ BLK_DEV_UMC8672 alpha=m i386=m
 #-
 #- *** FILE: drivers/idle/Kconfig ***
 #-
+INTEL_IDLE all=n i386=y x86_64=y
 I7300_IDLE x86_64=m
 
-#-
-#- *** FILE: drivers/ieee1394/Kconfig ***
-#-
-#- file drivers/firewire/Kconfig goes here
-IEEE1394 all=m sparc=n
-IEEE1394_OHCI1394 all=m sparc=
-#- PCILynx controller requires I2C
-IEEE1394_PCILYNX all=m sparc=
-#- SBP-2 support (for storage devices) requires SCSI
-IEEE1394_SBP2 all=m sparc=
-IEEE1394_SBP2_PHYS_DMA all=n
-IEEE1394_ETH1394_ROM_ENTRY all=y sparc=
-IEEE1394_ETH1394 all=m sparc=
-IEEE1394_RAWIO all=m sparc=
-IEEE1394_VIDEO1394 all=m sparc=
-IEEE1394_DV1394 all=m sparc=
-IEEE1394_VERBOSEDEBUG all=n sparc=
-
 #-
 #- *** FILE: drivers/ieee802154/Kconfig ***
 #-
@@ -974,9 +1142,11 @@ INFINIBAND_USER_MEM all=y sparc=
 INFINIBAND_ADDR_TRANS all=y sparc=
 #- file drivers/infiniband/hw/mthca/Kconfig goes here
 #- file drivers/infiniband/hw/ipath/Kconfig goes here
+#- file drivers/infiniband/hw/qib/Kconfig goes here
 #- file drivers/infiniband/hw/ehca/Kconfig goes here
 #- file drivers/infiniband/hw/amso1100/Kconfig goes here
 #- file drivers/infiniband/hw/cxgb3/Kconfig goes here
+#- file drivers/infiniband/hw/cxgb4/Kconfig goes here
 #- file drivers/infiniband/hw/mlx4/Kconfig goes here
 #- file drivers/infiniband/hw/nes/Kconfig goes here
 #- file drivers/infiniband/ulp/ipoib/Kconfig goes here
@@ -995,6 +1165,11 @@ INFINIBAND_AMSO1100_DEBUG all=n sparc=
 INFINIBAND_CXGB3 all=m sparc=
 INFINIBAND_CXGB3_DEBUG all=n sparc=
 
+#-
+#- *** FILE: drivers/infiniband/hw/cxgb4/Kconfig ***
+#-
+INFINIBAND_CXGB4 all=m
+
 #-
 #- *** FILE: drivers/infiniband/hw/ipath/Kconfig ***
 #-
@@ -1016,6 +1191,11 @@ INFINIBAND_MTHCA all=m sparc=
 INFINIBAND_NES all=m sparc=
 INFINIBAND_NES_DEBUG all=n
 
+#-
+#- *** FILE: drivers/infiniband/hw/qib/Kconfig ***
+#-
+INFINIBAND_QIB all=m
+
 #-
 #- *** FILE: drivers/infiniband/ulp/ipoib/Kconfig ***
 #-
@@ -1040,6 +1220,7 @@ INFINIBAND_SRP all=m sparc=
 INPUT all=y
 INPUT_FF_MEMLESS all=m
 INPUT_POLLDEV all=m
+INPUT_SPARSEKMAP all=m
 #- Userland interfaces
 INPUT_MOUSEDEV all=y
 INPUT_MOUSEDEV_PSAUX all=y
@@ -1093,6 +1274,7 @@ JOYSTICK_ZHENHUA all=m
 JOYSTICK_DB9 all=m
 JOYSTICK_GAMECON all=m
 JOYSTICK_TURBOGRAFX all=m
+JOYSTICK_AS5011 all=m
 JOYSTICK_JOYDUMP all=m
 JOYSTICK_XPAD all=m sparc=n
 JOYSTICK_XPAD_FF all=y ia64=n
@@ -1111,13 +1293,19 @@ JOYSTICK_IFORCE_232 all=y
 #-
 INPUT_KEYBOARD all=y
 KEYBOARD_ADP5588 all=m 
+KEYBOARD_ADP5589 all=m
 KEYBOARD_ATKBD all=y sparc=m sparc64=m
-QT2160 all=m
+KEYBOARD_QT1070 all=m
+KEYBOARD_QT2160 all=m
 KEYBOARD_LKKBD all=m
 KEYBOARD_GPIO all=m
+KEYBOARD_GPIO_POLLED all=m
+KEYBOARD_TCA6416 all=m
 KEYBOARD_MATRIX all=m
 KEYBOARD_LM8323 all=m
 KEYBOARD_MAX7359 all=m
+KEYBOARD_MCS all=m
+KEYBOARD_MPR121 all=m
 KEYBOARD_NEWTON all=m
 KEYBOARD_OPENCORES all=m
 KEYBOARD_STOWAWAY all=m
@@ -1129,6 +1317,10 @@ KEYBOARD_XTKBD all=m
 #- *** FILE: drivers/input/misc/Kconfig ***
 #-
 INPUT_MISC all=y
+INPUT_AB8500_PONKEY all=m
+INPUT_AD714X all=m
+INPUT_AD714X_I2C all=m
+INPUT_AD714X_SPI all=m
 INPUT_PCSPKR all=m
 INPUT_SPARCSPKR sparc64=m
 INPUT_APANEL all=m
@@ -1142,11 +1334,16 @@ INPUT_YEALINK all=m sparc=n
 INPUT_CM109 all=m
 INPUT_TWL4030_PWRBUTTON powerpc=m
 INPUT_UINPUT all=m sparc=n
-INPUT_WINBOND_CIR all=m
 INPUT_PCF50633_PMU all=m
+INPUT_PCF8574 all=m
 INPUT_GPIO_ROTARY_ENCODER all=m
 INPUT_WM831X_ON all=m
 INPUT_PCAP all=m
+INPUT_ADXL34X all=m
+INPUT_ADXL34X_I2C all=m
+INPUT_ADXL34X_SPI all=m
+INPUT_CMA3000 all=m
+INPUT_CMA3000_I2C all=m
 
 #-
 #- *** FILE: drivers/input/mouse/Kconfig ***
@@ -1184,6 +1381,8 @@ SERIO_PCIPS2 all=m
 SERIO_LIBPS2 all=y sparc=m sparc64=m
 SERIO_RAW all=m
 SERIO_XILINX_XPS_PS2 all=m
+SERIO_ALTERA_PS2 all=m
+SERIO_PS2MULT all=m
 
 #-
 #- *** FILE: drivers/input/tablet/Kconfig ***
@@ -1192,6 +1391,7 @@ INPUT_TABLET all=y sparc=n
 TABLET_USB_ACECAD all=m
 TABLET_USB_AIPTEK all=m
 TABLET_USB_GTCO all=m
+TABLET_USB_HANWANG all=m
 TABLET_USB_KBTAB all=m
 TABLET_USB_WACOM all=m
 
@@ -1201,27 +1401,38 @@ TABLET_USB_WACOM all=m
 INPUT_TOUCHSCREEN all=y
 TOUCHSCREEN_ADS7846 all=m sparc=n
 TOUCHSCREEN_AD7877 all=m
+TOUCHSCREEN_AD7879 all=m
 TOUCHSCREEN_AD7879_I2C all=m
+TOUCHSCREEN_AD7879_SPI all=m
+TOUCHSCREEN_ATMEL_MXT all=m
+TOUCHSCREEN_BU21013 all=m
+TOUCHSCREEN_CY8CTMG110 all=m
 TOUCHSCREEN_DA9034 all=m
+TOUCHSCREEN_DYNAPRO all=m
+TOUCHSCREEN_HAMPSHIRE all=m
 TOUCHSCREEN_EETI all=m
 TOUCHSCREEN_FUJITSU all=m
 TOUCHSCREEN_GUNZE all=m
 TOUCHSCREEN_ELO all=m
 TOUCHSCREEN_WACOM_W8001 all=m
+TOUCHSCREEN_MAX11801 all=m
 TOUCHSCREEN_MCS5000 all=m
 TOUCHSCREEN_MTOUCH all=m
 TOUCHSCREEN_INEXIO all=m
+TOUCHSCREEN_INTEL_MID all=m
 TOUCHSCREEN_MK712 all=m sparc=n
 TOUCHSCREEN_HTCPEN all=m
 TOUCHSCREEN_PENMOUNT all=m
 TOUCHSCREEN_TOUCHRIGHT all=m
 TOUCHSCREEN_TOUCHWIN all=m
 TOUCHSCREEN_UCB1400 all=m sparc=n
+TOUCHSCREEN_WM831X all=m
 TOUCHSCREEN_WM97XX all=m
 TOUCHSCREEN_WM9705 all=y
 TOUCHSCREEN_WM9712 all=y
 TOUCHSCREEN_WM9713 all=y
 TOUCHSCREEN_USB_COMPOSITE all=m sparc=n
+TOUCHSCREEN_MC13783 all=m
 TOUCHSCREEN_USB_EGALAX all=y
 TOUCHSCREEN_USB_PANJIT all=y
 TOUCHSCREEN_USB_3M all=y
@@ -1229,27 +1440,35 @@ TOUCHSCREEN_USB_ITM all=y
 TOUCHSCREEN_USB_ETURBO all=y
 TOUCHSCREEN_USB_GUNZE all=y
 TOUCHSCREEN_USB_DMC_TSC10 all=y
-TOUCHSCREEN_USB_IRTOUCH ia64=y
-TOUCHSCREEN_USB_IDEALTEK ia64=y
-TOUCHSCREEN_USB_GENERAL_TOUCH ia64=y
-TOUCHSCREEN_USB_GOTOP ia64=y
+TOUCHSCREEN_USB_IRTOUCH all=y
+TOUCHSCREEN_USB_IDEALTEK all=y
+TOUCHSCREEN_USB_GENERAL_TOUCH all=y
+TOUCHSCREEN_USB_GOTOP all=y
+TOUCHSCREEN_USB_JASTEC all=y
 TOUCHSCREEN_USB_E2I all=y
+TOUCHSCREEN_USB_ZYTRONIC all=y
+TOUCHSCREEN_USB_ETT_TC45USB all=y
+TOUCHSCREEN_USB_NEXIO all=y
 TOUCHSCREEN_TOUCHIT213 all=m
+TOUCHSCREEN_TSC2005 all=m
 TOUCHSCREEN_TSC2007 all=m
 TOUCHSCREEN_W90X900 all=m
 TOUCHSCREEN_PCAP all=m
+TOUCHSCREEN_ST1232 all=m
+TOUCHSCREEN_TPS6507X all=m
 
 #-
 #- *** FILE: drivers/isdn/Kconfig ***
 #-
 ISDN all=y s390=n
 ISDN_I4L all=m
-#- file drivers/isdn/mISDN/Kconfig goes here
 #- file drivers/isdn/i4l/Kconfig goes here
 ISDN_CAPI all=m
 #- file drivers/isdn/capi/Kconfig goes here
 #- file drivers/isdn/hardware/Kconfig goes here
 #- file drivers/isdn/gigaset/Kconfig goes here
+#- file drivers/isdn/hysdn/Kconfig goes here
+#- file drivers/isdn/mISDN/Kconfig goes here
 
 #-
 #- *** FILE: drivers/isdn/act2000/Kconfig ***
@@ -1263,14 +1482,13 @@ ISDN_DRV_AVMB1_VERBOSE_REASON all=y sparc=n sparc64=n
 CAPI_TRACE all=y
 ISDN_CAPI_MIDDLEWARE all=y
 ISDN_CAPI_CAPI20 all=m
-ISDN_CAPI_CAPIFS_BOOL all=y
-ISDN_CAPI_CAPIFS all=m
 ISDN_CAPI_CAPIDRV all=m
 
 #-
 #- *** FILE: drivers/isdn/gigaset/Kconfig ***
 #-
 ISDN_DRV_GIGASET all=m
+GIGASET_CAPI all=y
 GIGASET_BASE all=m
 GIGASET_M105 all=m
 GIGASET_M101 all=m
@@ -1347,7 +1565,6 @@ ISDN_DIVERSION all=m
 #- file drivers/isdn/pcbit/Kconfig goes here
 #- file drivers/isdn/sc/Kconfig goes here
 #- file drivers/isdn/act2000/Kconfig goes here
-#- file drivers/isdn/hysdn/Kconfig goes here
 
 #-
 #- *** FILE: drivers/isdn/icn/Kconfig ***
@@ -1377,26 +1594,36 @@ ISDN_DRV_SC all=m
 #-
 NEW_LEDS all=y
 #* ADB_PMU_LED forces it to 'y'
-LEDS_CLASS all=m ppc=y ppc64=y
+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
 LEDS_GPIO all=m
 LEDS_GPIO_PLATFORM all=y
 LEDS_GPIO_OF powerpc=y sparc=y
 LEDS_LP3944 all=m
+LEDS_LP5521 all=m
+LEDS_LP5523 all=m
 LEDS_CLEVO_MAIL all=m
 LEDS_PCA955X all=m
 LEDS_WM831X_STATUS all=m
 LEDS_WM8350 all=m
 LEDS_DA903X all=m
 LEDS_DAC124S085 all=m
+LEDS_REGULATOR all=m
 LEDS_BD2802 all=m
-#- LED Triggers
+LEDS_INTEL_SS4200 all=m
+LEDS_LT3593 all=m
+LEDS_DELL_NETBOOKS all=m
+LEDS_MC13783 all=m
 LEDS_TRIGGERS all=y
+#- LED Triggers
 LEDS_TRIGGER_TIMER all=m
 LEDS_TRIGGER_IDE_DISK all=y
 LEDS_TRIGGER_HEARTBEAT all=m
@@ -1433,6 +1660,9 @@ THERM_PM72 ppc64=n
 WINDFARM ppc=m ppc64=n
 ANSLCD ppc=m
 PMAC_RACKMETER ppc=m ppc64=m
+SENSORS_AMS ppc=m
+SENSORS_AMS_PMU ppc=y
+SENSORS_AMS_I2C ppc=y
 
 #-
 #- *** FILE: drivers/mca/Kconfig ***
@@ -1451,7 +1681,6 @@ MD_RAID1 all=m
 MD_RAID10 all=m
 MD_RAID456 all=m
 MULTICORE_RAID456 all=n
-ASYNC_RAID6_TEST all=m
 MD_MULTIPATH all=m
 MD_FAULTY all=m
 BLK_DEV_DM all=m
@@ -1459,6 +1688,7 @@ DM_DEBUG all=n
 DM_CRYPT all=m
 DM_SNAPSHOT all=m
 DM_MIRROR all=m
+DM_RAID all=m
 DM_LOG_USERSPACE all=m
 DM_ZERO all=m
 DM_MULTIPATH all=m
@@ -1466,25 +1696,25 @@ DM_MULTIPATH_QL all=m
 DM_MULTIPATH_ST all=m
 DM_DELAY all=m
 DM_UEVENT all=y
+DM_FLAKEY all=m
 
 #-
 #- *** FILE: drivers/media/Kconfig ***
 #-
 MEDIA_SUPPORT all=m
 #- Multimedia core support
+MEDIA_CONTROLLER all=y
 VIDEO_DEV all=m
 VIDEO_V4L2_COMMON all=m
-VIDEO_ALLOW_V4L1 all=y
-VIDEO_V4L1_COMPAT all=y
+VIDEO_V4L2_SUBDEV_API all=y
 DVB_CORE all=m
 #- Multimedia drivers
 #- file drivers/media/common/Kconfig goes here
+#- file drivers/media/rc/Kconfig goes here
 #- file drivers/media/common/tuners/Kconfig goes here
 #- file drivers/media/video/Kconfig goes here
 #- file drivers/media/radio/Kconfig goes here
 #- file drivers/media/dvb/Kconfig goes here
-DAB all=y
-USB_DABUSB all=m sparc=
 
 #-
 #- *** FILE: drivers/media/common/Kconfig ***
@@ -1497,6 +1727,7 @@ VIDEO_SAA7146_VV all=m
 #-
 MEDIA_ATTACH all=y
 MEDIA_TUNER_CUSTOMISE all=n
+MEDIA_TUNER_TDA18212 all=m
 
 #-
 #- *** FILE: drivers/media/dvb/Kconfig ***
@@ -1523,6 +1754,10 @@ DVB_CAPTURE_DRIVERS all=y
 #- file drivers/media/dvb/firewire/Kconfig goes here
 #- Supported Earthsoft PT1 Adapters
 #- file drivers/media/dvb/pt1/Kconfig goes here
+#- Supported Mantis Adapters
+#- file drivers/media/dvb/mantis/Kconfig goes here
+#- Supported nGene Adapters
+#- file drivers/media/dvb/ngene/Kconfig goes here
 #- Supported DVB Frontends
 #- file drivers/media/dvb/frontends/Kconfig goes here
 
@@ -1576,6 +1811,10 @@ DVB_USB_DTV5100 all=m
 DVB_USB_AF9015 all=m
 DVB_USB_CE6230 all=m
 DVB_USB_FRIIO all=m
+DVB_USB_EC168 all=m
+DVB_USB_AZ6027 all=m
+DVB_USB_LME2510 all=m
+DVB_USB_TECHNISAT_USB2 all=m
 
 #-
 #- *** FILE: drivers/media/dvb/firewire/Kconfig ***
@@ -1603,7 +1842,7 @@ DVB_SP8870 all=m
 DVB_SP887X all=m
 DVB_CX22700 all=m
 DVB_CX22702 all=m
-DVB_DRX397XD all=m
+DVB_DRXD all=m
 DVB_L64781 all=m
 DVB_TDA1004X all=m
 DVB_NXT6000 all=m
@@ -1614,6 +1853,8 @@ DVB_DIB3000MC all=m
 DVB_DIB7000M all=m
 DVB_DIB7000P all=m
 DVB_TDA10048 all=m
+DVB_STV0367 all=m
+DVB_CXD2820R all=m
 #- DVB-C (cable) frontends
 DVB_VES1820 all=m
 DVB_TDA10021 all=m
@@ -1625,7 +1866,6 @@ DVB_OR51211 all=m
 DVB_OR51132 all=m
 DVB_BCM3510 all=m
 DVB_LGDT330X all=m
-DVB_LGDT3304 all=m
 DVB_S5H1409 all=m
 DVB_AU8522 all=m
 DVB_S5H1411 all=m
@@ -1640,7 +1880,18 @@ DVB_ISL6405 all=m
 DVB_ISL6421 all=m
 DVB_LGS8GL5 all=m
 #- Tools to develop new frontends
-DVB_DUMMY_FE all=m
+
+#-
+#- *** FILE: drivers/media/dvb/mantis/Kconfig ***
+#-
+MANTIS_CORE all=m
+DVB_MANTIS all=m
+DVB_HOPPER all=m
+
+#-
+#- *** FILE: drivers/media/dvb/ngene/Kconfig ***
+#-
+DVB_NGENE all=m
 
 #-
 #- *** FILE: drivers/media/dvb/pluto2/Kconfig ***
@@ -1689,9 +1940,8 @@ 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_GEMTEK_PCI all=m
 RADIO_MAXIRADIO all=m
-RADIO_MAESTRO all=m
+RADIO_MIROPCM20 all=m
 RADIO_SF16FMI alpha=m i386=m
 RADIO_SF16FMR2 alpha=m i386=m
 RADIO_TERRATEC alpha=m i386=m
@@ -1705,6 +1955,11 @@ 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 ***
@@ -1712,24 +1967,57 @@ RADIO_TEA5764 all=m
 USB_SI470X all=m
 I2C_SI470X all=m
 
+#-
+#- *** FILE: drivers/media/radio/wl128x/Kconfig ***
+#-
+RADIO_WL128X all=m
+
+#-
+#- *** FILE: drivers/media/rc/Kconfig ***
+#-
+RC_CORE all=m
+#- file drivers/media/rc/keymaps/Kconfig goes here
+IR_NEC_DECODER all=m
+IR_RC5_DECODER all=m
+IR_RC6_DECODER all=m
+IR_JVC_DECODER all=m
+IR_SONY_DECODER all=m
+IR_RC5_SZ_DECODER all=m
+IR_LIRC_CODEC all=m
+IR_ENE all=m
+IR_IMON all=m
+IR_MCEUSB all=m
+IR_ITE_CIR all=m
+IR_FINTEK all=m
+IR_NUVOTON all=m
+IR_REDRAT3 all=m
+IR_STREAMZAP all=m
+IR_WINBOND_CIR all=m
+RC_LOOPBACK all=m
+
+#-
+#- *** FILE: drivers/media/rc/keymaps/Kconfig ***
+#-
+RC_MAP all=m
+
 #-
 #- *** FILE: drivers/media/video/Kconfig ***
 #-
 VIDEO_V4L2 all=m
-VIDEO_V4L1 all=m
 VIDEO_BTCX all=m sparc=
-VIDEO_IR all=m sparc=
 VIDEO_TVEEPROM all=m
 VIDEO_TUNER all=m sparc=
+VIDEOBUF2_CORE all=m
+VIDEOBUF2_MEMOPS all=m
+VIDEOBUF2_VMALLOC all=m
 VIDEO_CAPTURE_DRIVERS all=y
 VIDEO_ADV_DEBUG all=n
 VIDEO_FIXED_MINOR_RANGES all=n
 VIDEO_HELPER_CHIPS_AUTO all=y
-#- Audio decoders
+#- Audio decoders, processors and mixers
 VIDEO_TVAUDIO all=m
 VIDEO_TDA7432 all=m
 VIDEO_TDA9840 all=m
-VIDEO_TDA9875 all=m
 VIDEO_TEA6415C all=m
 VIDEO_TEA6420 all=m
 VIDEO_MSP3400 all=m
@@ -1743,7 +2031,6 @@ VIDEO_SAA6588 all=m
 VIDEO_BT819 all=m
 VIDEO_BT856 all=m
 VIDEO_KS0127 all=m
-VIDEO_OV7670 all=m
 VIDEO_SAA7110 all=m
 VIDEO_SAA711X all=m
 VIDEO_TVP5150 all=m
@@ -1757,28 +2044,28 @@ VIDEO_SAA7127 all=m
 VIDEO_SAA7185 all=m
 VIDEO_ADV7170 all=m
 VIDEO_ADV7175 all=m
+#- Camera sensor devices
+VIDEO_OV7670 all=m
 #- 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
-VIDEO_CPIA all=m sparc=n
-VIDEO_CPIA_PP all=m
-VIDEO_CPIA_USB all=m
 #- file drivers/media/video/cpia2/Kconfig goes here
-VIDEO_SAA5246A all=m
-VIDEO_SAA5249 all=m
-VIDEO_STRADIS all=m ppc=n sparc=n
 #- 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
 #- file drivers/media/video/au0828/Kconfig goes here
@@ -1786,14 +2073,25 @@ VIDEO_HEXIUM_GEMINI all=m
 #- file drivers/media/video/cx18/Kconfig goes here
 #- file drivers/media/video/saa7164/Kconfig goes here
 VIDEO_CAFE_CCIC all=m sparc=n
+VIDEO_SR030PC30 all=m
+VIDEO_VIA_CAMERA all=m
+VIDEO_NOON010PC30 all=m
+#- file drivers/media/video/m5mols/Kconfig goes here
 SOC_CAMERA all=m
+SOC_CAMERA_IMX074 all=m
 SOC_CAMERA_MT9M001 all=m
 SOC_CAMERA_MT9M111 all=m
 SOC_CAMERA_MT9T031 all=m
+SOC_CAMERA_MT9T112 all=m
 SOC_CAMERA_MT9V022 all=m
+SOC_CAMERA_RJ54N1 all=m
 SOC_CAMERA_TW9910 all=m
 SOC_CAMERA_PLATFORM all=m
+SOC_CAMERA_OV2640 all=m
+SOC_CAMERA_OV6650 all=m
 SOC_CAMERA_OV772X all=m
+SOC_CAMERA_OV9640 all=m
+SOC_CAMERA_OV9740 all=m
 VIDEO_SH_MOBILE_CEU all=m
 V4L_USB_DRIVERS all=y sparc=n
 #- file drivers/media/video/uvc/Kconfig goes here
@@ -1801,21 +2099,17 @@ V4L_USB_DRIVERS all=y sparc=n
 #- 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/usbvideo/Kconfig goes here
 #- file drivers/media/video/et61x251/Kconfig goes here
-VIDEO_OVCAMCHIP all=m
-USB_W9968CF all=m
-USB_OV511 all=m
-USB_SE401 all=m
 #- file drivers/media/video/sn9c102/Kconfig goes here
-USB_STV680 all=m
-#- file drivers/media/video/zc0301/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
 
 #-
 #- *** FILE: drivers/media/video/au0828/Kconfig ***
@@ -1837,11 +2131,13 @@ VIDEO_CPIA2 all=m
 #- *** FILE: drivers/media/video/cx18/Kconfig ***
 #-
 VIDEO_CX18 all=m sparc=n
+VIDEO_CX18_ALSA all=m
 
 #-
 #- *** FILE: drivers/media/video/cx231xx/Kconfig ***
 #-
 VIDEO_CX231XX all=m
+VIDEO_CX231XX_RC all=y
 VIDEO_CX231XX_ALSA all=m
 VIDEO_CX231XX_DVB all=m
 
@@ -1849,6 +2145,7 @@ VIDEO_CX231XX_DVB all=m
 #- *** FILE: drivers/media/video/cx23885/Kconfig ***
 #-
 VIDEO_CX23885 all=m sparc=n
+MEDIA_ALTERA_CI all=m
 
 #-
 #- *** FILE: drivers/media/video/cx25840/Kconfig ***
@@ -1883,18 +2180,25 @@ USB_GSPCA all=m
 #- file drivers/media/video/gspca/m5602/Kconfig goes here
 #- file drivers/media/video/gspca/stv06xx/Kconfig goes here
 #- file drivers/media/video/gspca/gl860/Kconfig goes here
+USB_GSPCA_BENQ all=m
 USB_GSPCA_CONEX all=m
+USB_GSPCA_CPIA1 all=m
 USB_GSPCA_ETOMS all=m
 USB_GSPCA_FINEPIX all=m
 USB_GSPCA_JEILINJ all=m
+USB_GSPCA_KINECT all=m
+USB_GSPCA_KONICA all=m
 USB_GSPCA_MARS all=m
 USB_GSPCA_MR97310A all=m
+USB_GSPCA_NW80X all=m
 USB_GSPCA_OV519 all=m
 USB_GSPCA_OV534 all=m
+USB_GSPCA_OV534_9 all=m
 USB_GSPCA_PAC207 all=m
+USB_GSPCA_PAC7302 all=m
 USB_GSPCA_PAC7311 all=m
+USB_GSPCA_SN9C2028 all=m
 USB_GSPCA_SN9C20X all=m
-USB_GSPCA_SN9C20X_EVDEV all=y
 USB_GSPCA_SONIXB all=m
 USB_GSPCA_SONIXJ all=m
 USB_GSPCA_SPCA500 all=m
@@ -1903,13 +2207,18 @@ USB_GSPCA_SPCA505 all=m
 USB_GSPCA_SPCA506 all=m
 USB_GSPCA_SPCA508 all=m
 USB_GSPCA_SPCA561 all=m
+USB_GSPCA_SPCA1528 all=m
 USB_GSPCA_SQ905 all=m
 USB_GSPCA_SQ905C all=m
+USB_GSPCA_SQ930X all=m
 USB_GSPCA_STK014 all=m
+USB_GSPCA_STV0680 all=m
 USB_GSPCA_SUNPLUS all=m
 USB_GSPCA_T613 all=m
 USB_GSPCA_TV8532 all=m
 USB_GSPCA_VC032X all=m
+USB_GSPCA_VICAM all=m
+USB_GSPCA_XIRLINK_CIT all=m
 USB_GSPCA_ZC3XX all=m
 
 #-
@@ -1938,6 +2247,11 @@ VIDEO_HDPVR all=m
 VIDEO_IVTV all=m sparc=n
 VIDEO_FB_IVTV all=m sparc=n
 
+#-
+#- *** FILE: drivers/media/video/m5mols/Kconfig ***
+#-
+VIDEO_M5MOLS all=m
+
 #-
 #- *** FILE: drivers/media/video/pvrusb2/Kconfig ***
 #-
@@ -1958,6 +2272,7 @@ USB_PWC_INPUT_EVDEV all=y
 #-
 VIDEO_SAA7134 all=m sparc=n
 VIDEO_SAA7134_ALSA all=m
+VIDEO_SAA7134_RC all=y
 VIDEO_SAA7134_DVB all=m sparc64=n
 
 #-
@@ -1971,13 +2286,9 @@ VIDEO_SAA7164 all=m
 USB_SN9C102 all=m
 
 #-
-#- *** FILE: drivers/media/video/usbvideo/Kconfig ***
+#- *** FILE: drivers/media/video/tlg2300/Kconfig ***
 #-
-VIDEO_USBVIDEO all=m
-USB_VICAM all=m
-USB_IBMCAM all=m
-USB_KONICAWC all=m
-USB_QUICKCAM_MESSENGER all=m
+VIDEO_TLG2300 all=m
 
 #-
 #- *** FILE: drivers/media/video/usbvision/Kconfig ***
@@ -1990,11 +2301,6 @@ VIDEO_USBVISION all=m
 USB_VIDEO_CLASS all=m sparc=n
 USB_VIDEO_CLASS_INPUT_EVDEV all=y sparc=n
 
-#-
-#- *** FILE: drivers/media/video/zc0301/Kconfig ***
-#-
-USB_ZC0301 all=m
-
 #-
 #- *** FILE: drivers/media/video/zoran/Kconfig ***
 #-
@@ -2028,6 +2334,7 @@ MSPRO_BLOCK all=m
 #- MemoryStick Host Controller Drivers
 MEMSTICK_TIFM_MS all=m
 MEMSTICK_JMICRON_38X all=m
+MEMSTICK_R592 all=m
 
 #-
 #- *** FILE: drivers/message/fusion/Kconfig ***
@@ -2058,44 +2365,83 @@ 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
 UCB1400_CORE all=m
+TPS6105X all=m
 TPS65010 all=m
+TPS6507X all=m
+MFD_TPS6586X all=m
 TWL4030_CORE powerpc=y
 PMIC_DA903X powerpc=y
 MFD_WM8400 all=m
-MFD_WM831X all=m
-MFD_WM8350_I2C all=m
+MFD_WM831X all=y
+MFD_WM831X_SPI all=y
+MFD_WM8350_I2C all=y
+MFD_WM8994 all=y
 MFD_PCF50633 all=m
-MFD_MC13783 all=m
 PCF50633_ADC all=m
 PCF50633_GPIO all=m
-AB3100_CORE all=m
+MFD_MC13783 all=m
+MFD_MC13XXX all=m
+ABX500_CORE all=y
+AB3100_CORE all=y
 AB3100_OTP all=m
 EZX_PCAP all=y
+AB8500_CORE all=y
+AB8500_DEBUG all=n
+AB8500_GPADC all=y
+MFD_CS5535 all=m
+MFD_TIMBERDALE all=m
+LPC_SCH all=m
+MFD_RDC321X all=m
+MFD_JANZ_CMODIO all=m
+MFD_VX855 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
 IBM_ASM i386=m x86_64=m
 PHANTOM all=m
+INTEL_MID_PTI all=m
 SGI_IOC4 all=m ppc=n ppc64=n
 TIFM_CORE all=m
 TIFM_7XX1 all=m
 ICS932S401 all=m
 ENCLOSURE_SERVICES all=m
 SGI_XP ia64=m x86_64=m
+CS5535_MFGPT all=m
+CS5535_CLOCK_EVENT_SRC all=m
 HP_ILO all=m
 SGI_GRU ia64=m x86_64=m
 SGI_GRU_DEBUG ia64=n x86_64=n
-DELL_LAPTOP all=m
+APDS9802ALS all=m
 ISL29003 all=m
+ISL29020 all=m
+SENSORS_TSL2550 all=m
+SENSORS_BH1780 all=m
+SENSORS_BH1770 all=m
+SENSORS_APDS990X all=m
+HMC6352 all=m
+DS1682 all=m
+TI_DAC7512 all=m
+VMWARE_BALLOON all=m
+BMP085 all=m
+PCH_PHUB all=m
 #- file drivers/misc/c2port/Kconfig goes here
 #- file drivers/misc/eeprom/Kconfig goes here
 #- file drivers/misc/cb710/Kconfig goes here
+#- file drivers/misc/iwmc3200top/Kconfig goes here
+#- file drivers/misc/ti-st/Kconfig goes here
+#- file drivers/misc/lis3lv02d/Kconfig goes here
+#- file drivers/misc/carma/Kconfig goes here
 
 #-
 #- *** FILE: drivers/misc/c2port/Kconfig ***
@@ -2118,6 +2464,24 @@ EEPROM_LEGACY all=m
 EEPROM_MAX6875 all=m
 EEPROM_93CX6 all=m
 
+#-
+#- *** FILE: drivers/misc/iwmc3200top/Kconfig ***
+#-
+IWMC3200TOP all=m
+IWMC3200TOP_DEBUG all=n
+IWMC3200TOP_DEBUGFS all=n
+
+#-
+#- *** FILE: drivers/misc/lis3lv02d/Kconfig ***
+#-
+SENSORS_LIS3_SPI all=m
+SENSORS_LIS3_I2C all=m
+
+#-
+#- *** FILE: drivers/misc/ti-st/Kconfig ***
+#-
+TI_ST all=m
+
 #-
 #- *** FILE: drivers/mmc/Kconfig ***
 #-
@@ -2132,6 +2496,7 @@ MMC_DEBUG all=n
 #-
 #- MMC/SD/SDIO Card Drivers
 MMC_BLOCK all=m
+MMC_BLOCK_MINORS all=8
 MMC_BLOCK_BOUNCE all=y
 SDIO_UART all=m
 MMC_TEST all=n
@@ -2140,6 +2505,7 @@ MMC_TEST all=n
 #- *** FILE: drivers/mmc/core/Kconfig ***
 #-
 MMC_UNSAFE_RESUME all=n
+MMC_CLKGATE all=n
 
 #-
 #- *** FILE: drivers/mmc/host/Kconfig ***
@@ -2147,7 +2513,7 @@ MMC_UNSAFE_RESUME all=n
 #- MMC/SD/SDIO Host Controller Drivers
 MMC_SDHCI all=m sparc=n
 MMC_SDHCI_PCI all=m
-MMC_RICOH_MMC all=m
+MMC_RICOH_MMC all=y
 MMC_SDHCI_OF powerpc=m
 MMC_SDHCI_PLTFM all=m
 MMC_WBSD all=m
@@ -2156,6 +2522,8 @@ MMC_SPI all=m
 MMC_SDRICOH_CS all=m
 MMC_CB710 all=m
 MMC_VIA_SDMMC all=m
+MMC_VUB300 all=m
+MMC_USHC all=m
 
 #-
 #- *** FILE: drivers/mtd/Kconfig ***
@@ -2163,8 +2531,6 @@ MMC_VIA_SDMMC all=m
 MTD all=m
 MTD_DEBUG all=n
 MTD_TESTS all=m
-MTD_CONCAT all=m
-MTD_PARTITIONS all=y
 MTD_REDBOOT_PARTS all=m
 MTD_REDBOOT_DIRECTORY_BLOCK all=-1
 MTD_REDBOOT_PARTS_UNALLOCATED all=y
@@ -2182,7 +2548,9 @@ NFTL_RW all=y
 INFTL all=m
 RFD_FTL all=m
 SSFDC all=m
+SM_FTL all=m
 MTD_OOPS all=m
+MTD_SWAP all=m
 #- file drivers/mtd/chips/Kconfig goes here
 #- file drivers/mtd/maps/Kconfig goes here
 #- file drivers/mtd/devices/Kconfig goes here
@@ -2279,18 +2647,26 @@ MTD_DILNETPC i386=m x86_64=m
 MTD_DILNETPC_BOOTSIZE i386=0x80000 x86_64=0x80000
 MTD_L440GX i386=m x86_64=m
 MTD_PCI all=m
+MTD_PCMCIA all=m
+MTD_PCMCIA_ANONYMOUS all=y
 MTD_GPIO_ADDR all=m
 MTD_INTEL_VR_NOR all=m
 MTD_PLATRAM all=m
+MTD_LATCH_ADDR all=m
 
 #-
 #- *** FILE: drivers/mtd/nand/Kconfig ***
 #-
+MTD_NAND_ECC_SMC all=y
 MTD_NAND all=m
 MTD_NAND_VERIFY_WRITE all=y
-MTD_NAND_ECC_SMC all=y
+MTD_NAND_BCH all=m
+MTD_NAND_ECC_BCH all=y
 MTD_NAND_MUSEUM_IDS all=y sparc=n
+MTD_NAND_DENALI all=m
+MTD_NAND_DENALI_SCRATCH_REG_ADDR all=0xFF108018
 MTD_NAND_IDS all=m
+MTD_NAND_RICOH all=m
 MTD_NAND_DISKONCHIP all=m
 MTD_NAND_DISKONCHIP_PROBE_ADVANCED all=n
 MTD_NAND_DISKONCHIP_PROBE_ADDRESS all=0
@@ -2320,12 +2696,6 @@ MTD_UBI all=m sparc=n
 MTD_UBI_WL_THRESHOLD all=4096
 MTD_UBI_BEB_RESERVE all=1
 MTD_UBI_GLUEBI all=n powerpc=m
-#- file drivers/mtd/ubi/Kconfig.debug goes here
-
-#-
-#- *** FILE: drivers/mtd/ubi/Kconfig.debug ***
-#-
-#- UBI debugging options
 MTD_UBI_DEBUG all=n
 
 #-
@@ -2336,14 +2706,15 @@ IFB all=m
 DUMMY all=m
 BONDING all=m
 MACVLAN all=m
+MACVTAP all=m
 EQUALIZER all=m
 TUN all=m
 VETH all=m
 NET_SB1000 all=m
 #- file drivers/net/arcnet/Kconfig goes here
+MII all=m
 #- file drivers/net/phy/Kconfig goes here
 NET_ETHERNET all=y
-MII all=m
 #- file drivers/net/arm/Kconfig goes here
 MACE ppc=m
 MACE_AAUI_PORT ppc=y
@@ -2406,10 +2777,10 @@ 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
-FORCEDETH_NAPI all=y
 CS89x0 alpha=m i386=m
 E100 all=m
 LNE390 alpha=m i386=m
@@ -2446,6 +2817,7 @@ 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
@@ -2462,7 +2834,6 @@ NS83820 all=m
 HAMACHI all=m
 YELLOWFIN all=m
 R8169 all=m sparc=n
-R8169_VLAN all=y
 SIS190 all=m sparc=n
 SKGE all=m
 SKGE_DEBUG all=n
@@ -2475,7 +2846,6 @@ CNIC all=m
 SPIDER_NET ppc64=m
 GELIC_NET ppc64=m
 GELIC_WIRELESS ppc64=y
-GELIC_WIRELESS_OLD_PSK_INTERFACE ppc64=n
 GIANFAR ppc=m
 MV643XX_ETH ppc=m
 QLA3XXX all=m sparc=n
@@ -2484,14 +2854,18 @@ 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
@@ -2505,7 +2879,9 @@ 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/tokenring/Kconfig goes here
@@ -2517,7 +2893,11 @@ QLGE all=m
 #- 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
@@ -2535,6 +2915,7 @@ 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
@@ -2582,16 +2963,37 @@ ARCNET_COM20020_PCI all=m
 #-
 BE2NET all=m
 
+#-
+#- *** FILE: drivers/net/caif/Kconfig ***
+#-
+#- CAIF transport drivers
+CAIF_TTY all=m
+CAIF_SPI_SLAVE all=m
+CAIF_SPI_SYNC all=y
+
 #-
 #- *** 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/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/sja1000/Kconfig ***
 #-
@@ -2601,11 +3003,20 @@ 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
+
+#-
+#- *** 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
 
 #-
 #- *** FILE: drivers/net/hamradio/Kconfig ***
@@ -2694,11 +3105,13 @@ CICADA_PHY all=m
 VITESSE_PHY all=m
 SMSC_PHY all=m
 BROADCOM_PHY all=m
+BCM63XX_PHY all=m
 ICPLUS_PHY all=m
 REALTEK_PHY all=m
 NATIONAL_PHY all=m
 STE10XP all=m
 LSI_ET1011C_PHY all=m
+MICREL_PHY all=m
 FIXED_PHY all=y
 MDIO_BITBANG all=m
 MDIO_GPIO all=m
@@ -2709,6 +3122,13 @@ MDIO_GPIO all=m
 SFC all=m sparc=n
 SFC_MTD all=y
 
+#-
+#- *** FILE: drivers/net/stmmac/Kconfig ***
+#-
+STMMAC_ETH all=m
+STMMAC_DA all=y
+STMMAC_DUAL_MAC all=y
+
 #-
 #- *** FILE: drivers/net/tokenring/Kconfig ***
 #-
@@ -2754,7 +3174,9 @@ USB_USBNET all=m
 USB_NET_AX8817X all=m
 USB_NET_CDCETHER all=m
 USB_NET_CDC_EEM all=m
+USB_NET_CDC_NCM all=m
 USB_NET_DM9601 all=m
+USB_NET_SMSC75XX all=m
 USB_NET_SMSC95XX all=m
 USB_NET_GL620A all=m
 USB_NET_NET1080 all=m
@@ -2769,9 +3191,14 @@ USB_ARMLINUX all=y
 USB_EPSON2888 all=y ppc=n ppc64=n
 USB_KC2190 all=y
 USB_NET_ZAURUS all=m
+USB_NET_CX82310_ETH all=m
+USB_NET_KALMIA all=m
 USB_HSO all=m
 USB_NET_INT51X1 all=m
 USB_CDC_PHONET all=m
+USB_IPHETH all=m
+USB_SIERRA_NET all=m
+USB_VL600 all=m
 
 #-
 #- *** FILE: drivers/net/wan/Kconfig ***
@@ -2820,27 +3247,16 @@ SBNI_MULTILINE i386=y x86_64=y
 #- Enable MMC support to see WiMAX SDIO drivers
 WIMAX_I2400M_USB all=m
 WIMAX_I2400M_SDIO all=m
+WIMAX_IWMC3200_SDIO all=y
 WIMAX_I2400M_DEBUG_LEVEL all=8
 
 #-
 #- *** FILE: drivers/net/wireless/Kconfig ***
 #-
 WLAN all=y
-WLAN_PRE80211 all=y ppc=n ppc64=n
-STRIP all=m
-ARLAN i386=m
-WAVELAN alpha=m i386=m
-PCMCIA_WAVELAN all=m
-PCMCIA_NETWAVE all=m
-WLAN_80211 all=y
 PCMCIA_RAYCS all=m
-LIBERTAS all=m
-LIBERTAS_USB all=m sparc=
-LIBERTAS_CS all=m
-LIBERTAS_SDIO all=m
-LIBERTAS_SPI all=m
-LIBERTAS_DEBUG all=n
 LIBERTAS_THINFIRM all=m
+LIBERTAS_THINFIRM_DEBUG all=n
 LIBERTAS_THINFIRM_USB all=m
 AIRO all=m
 ATMEL all=m
@@ -2852,48 +3268,60 @@ PCMCIA_WL3501 all=m
 PRISM54 all=m
 USB_ZD1201 all=m
 USB_NET_RNDIS_WLAN all=m
-RTL8180 all=m
-RTL8187 all=m
+#- file drivers/net/wireless/rtl818x/Kconfig goes here
 ADM8211 all=m
 MAC80211_HWSIM all=m
 MWL8K all=m
-#- file drivers/net/wireless/p54/Kconfig goes here
 #- file drivers/net/wireless/ath/Kconfig goes here
-#- file drivers/net/wireless/ipw2x00/Kconfig goes here
-#- file drivers/net/wireless/iwlwifi/Kconfig goes here
-#- file drivers/net/wireless/hostap/Kconfig goes here
 #- file drivers/net/wireless/b43/Kconfig goes here
 #- file drivers/net/wireless/b43legacy/Kconfig goes here
-#- file drivers/net/wireless/zd1211rw/Kconfig goes here
-#- file drivers/net/wireless/rt2x00/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
+#- file drivers/net/wireless/iwlegacy/Kconfig goes here
+#- file drivers/net/wireless/iwmc3200wifi/Kconfig goes here
+#- file drivers/net/wireless/libertas/Kconfig goes here
 #- file drivers/net/wireless/orinoco/Kconfig goes here
+#- file drivers/net/wireless/p54/Kconfig goes here
+#- file drivers/net/wireless/rt2x00/Kconfig goes here
+#- file drivers/net/wireless/rtlwifi/Kconfig goes here
+#- file drivers/net/wireless/wl1251/Kconfig goes here
 #- file drivers/net/wireless/wl12xx/Kconfig goes here
-#- file drivers/net/wireless/iwmc3200wifi/Kconfig goes here
+#- file drivers/net/wireless/zd1211rw/Kconfig goes here
+#- file drivers/net/wireless/mwifiex/Kconfig goes here
 
 #-
 #- *** FILE: drivers/net/wireless/ath/Kconfig ***
 #-
 ATH_COMMON all=m
+ATH_DEBUG all=n
 #- file drivers/net/wireless/ath/ath5k/Kconfig goes here
 #- file drivers/net/wireless/ath/ath9k/Kconfig goes here
-#- file drivers/net/wireless/ath/ar9170/Kconfig goes here
-
-#-
-#- *** FILE: drivers/net/wireless/ath/ar9170/Kconfig ***
-#-
-AR9170_USB all=m
+#- file drivers/net/wireless/ath/carl9170/Kconfig goes here
 
 #-
 #- *** FILE: drivers/net/wireless/ath/ath5k/Kconfig ***
 #-
 ATH5K all=m
 ATH5K_DEBUG all=n
+ATH5K_TRACER all=n
 
 #-
 #- *** FILE: drivers/net/wireless/ath/ath9k/Kconfig ***
 #-
 ATH9K all=m
-ATH9K_DEBUG all=n
+ATH9K_PCI all=y
+ATH9K_AHB all=y
+ATH9K_DEBUGFS all=n
+ATH9K_RATE_CONTROL all=y
+ATH9K_HTC all=m
+ATH9K_HTC_DEBUGFS all=y
+
+#-
+#- *** FILE: drivers/net/wireless/ath/carl9170/Kconfig ***
+#-
+CARL9170 all=m
+CARL9170_LEDS all=y
 
 #-
 #- *** FILE: drivers/net/wireless/b43/Kconfig ***
@@ -2901,6 +3329,7 @@ ATH9K_DEBUG all=n
 B43 all=m
 B43_PCMCIA all=y
 B43_SDIO all=y
+B43_PHY_N all=y
 B43_PHY_LP all=y
 B43_DEBUG all=n
 
@@ -2937,29 +3366,54 @@ IPW2200_QOS all=y
 IPW2200_DEBUG all=n
 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
+
 #-
 #- *** FILE: drivers/net/wireless/iwlwifi/Kconfig ***
 #-
-IWLWIFI all=m
-IWLWIFI_LEDS all=y
-IWLWIFI_SPECTRUM_MEASUREMENT all=y
-IWLWIFI_DEBUG all=y
 IWLAGN all=m
-IWL4965 all=y
-IWL5000 all=y
-IWL3945 all=m
-IWL3945_SPECTRUM_MEASUREMENT all=y
+IWLWIFI_DEBUG all=y
+IWLWIFI_DEBUG_EXPERIMENTAL_UCODE all=y
+IWLWIFI_DEVICE_TRACING all=n
+IWLWIFI_DEVICE_SVTOOL all=y
+IWL_P2P all=n
 
 #-
 #- *** FILE: drivers/net/wireless/iwmc3200wifi/Kconfig ***
 #-
 IWM all=m
 IWM_DEBUG all=n
+IWM_TRACING all=n
+
+#-
+#- *** FILE: drivers/net/wireless/libertas/Kconfig ***
+#-
+LIBERTAS all=m
+LIBERTAS_USB all=m sparc=
+LIBERTAS_CS all=m
+LIBERTAS_SDIO all=m
+LIBERTAS_SPI all=m
+LIBERTAS_DEBUG all=n
+LIBERTAS_MESH all=y
+
+#-
+#- *** FILE: drivers/net/wireless/mwifiex/Kconfig ***
+#-
+MWIFIEX all=m
+MWIFIEX_SDIO all=m
 
 #-
 #- *** FILE: drivers/net/wireless/orinoco/Kconfig ***
 #-
 HERMES all=m
+HERMES_PRISM all=y
 HERMES_CACHE_FW_ON_INIT all=y
 APPLE_AIRPORT ppc=m ppc64=m
 PLX_HERMES all=m
@@ -2968,6 +3422,7 @@ NORTEL_HERMES all=m
 PCI_HERMES all=m
 PCMCIA_HERMES all=m
 PCMCIA_SPECTRUM all=m
+ORINOCO_USB all=m
 
 #-
 #- *** FILE: drivers/net/wireless/p54/Kconfig ***
@@ -2976,6 +3431,7 @@ P54_COMMON all=m
 P54_USB all=m
 P54_PCI all=m
 P54_SPI all=m
+P54_SPI_DEFAULT_EEPROM all=y
 
 #-
 #- *** FILE: drivers/net/wireless/rt2x00/Kconfig ***
@@ -2984,26 +3440,61 @@ RT2X00 all=m
 RT2400PCI all=m
 RT2500PCI all=m
 RT61PCI all=m
+RT2800PCI all=m
+RT2800PCI_RT33XX all=y
+RT2800PCI_RT35XX all=y
+RT2800PCI_RT53XX all=y
 RT2500USB all=m
 RT73USB all=m
 RT2800USB all=m
-#- rt2x00 leds support disabled due to modularized LEDS_CLASS and built-in rt2x00
+RT2800USB_RT33XX all=y
+RT2800USB_RT35XX all=y
+RT2800USB_RT53XX all=y
+RT2800USB_UNKNOWN all=y
 RT2X00_DEBUG all=n
 
 #-
-#- *** FILE: drivers/net/wireless/wl12xx/Kconfig ***
+#- *** FILE: drivers/net/wireless/rtl818x/Kconfig ***
 #-
-WL12XX all=m
-WL1251 all=m
-WL1251_SPI all=m
-WL1251_SDIO all=m
-WL1271 all=m
+RTL8180 all=m
+RTL8187 all=m
 
 #-
-#- *** FILE: drivers/net/wireless/zd1211rw/Kconfig ***
+#- *** FILE: drivers/net/wireless/rtlwifi/Kconfig ***
 #-
-ZD1211RW all=m
-ZD1211RW_DEBUG all=n
+RTL8192CE all=m
+RTL8192SE all=m
+RTL8192CU all=m
+RTL8192C_COMMON all=m
+
+#-
+#- *** FILE: drivers/net/wireless/wl1251/Kconfig ***
+#-
+WL1251 all=m
+WL1251_SPI all=m
+WL1251_SDIO all=m
+
+#-
+#- *** FILE: drivers/net/wireless/wl12xx/Kconfig ***
+#-
+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 ***
+#-
+ZD1211RW all=m
+ZD1211RW_DEBUG all=n
+
+#-
+#- *** FILE: drivers/nfc/Kconfig ***
+#-
+NFC_DEVICES all=y
+PN544_NFC all=m
 
 #-
 #- *** FILE: drivers/parisc/Kconfig ***
@@ -3034,11 +3525,11 @@ PARPORT_NOT_PC all=y
 #-
 ARCH_SUPPORTS_MSI ppc=y sparc=n sparc64=y
 PCI_MSI all=y sparc64=n
-PCI_LEGACY all=y
 PCI_DEBUG all=n
 PCI_STUB all=m
 HT_IRQ i386=y x86_64=y
 PCI_IOV all=y
+PCI_LABEL all=y
 
 #-
 #- *** FILE: drivers/pci/hotplug/Kconfig ***
@@ -3063,7 +3554,8 @@ HOTPLUG_PCI_SGI ia64=m
 PCIEPORTBUS all=y
 HOTPLUG_PCI_PCIE all=m
 #- file drivers/pci/pcie/aer/Kconfig goes here
-PCIEASPM all=n
+PCIEASPM all=y
+PCIEASPM_DEBUG all=n
 
 #-
 #- *** FILE: drivers/pci/pcie/aer/Kconfig ***
@@ -3081,10 +3573,8 @@ PCIEAER_INJECT all=m
 #- *** FILE: drivers/pcmcia/Kconfig ***
 #-
 PCCARD all=m
-PCMCIA_DEBUG all=n
 PCMCIA all=m
 PCMCIA_LOAD_CIS all=y
-PCMCIA_IOCTL all=y ppc=n ppc64=n x86_64=n
 CARDBUS all=y
 #- PC-card bridges
 YENTA all=m
@@ -3097,38 +3587,61 @@ PD6729 all=m
 I82092 all=m
 I82365 alpha=m i386=m
 TCIC alpha=m i386=m
+PCMCIA_DEBUG all=n
 PCMCIA_PROBE alpha=y i386=y
 ELECTRA_CF ppc64=m
-PCCARD_NONSTATIC all=m
+PCCARD_NONSTATIC all=y
 
 #-
 #- *** FILE: drivers/platform/x86/Kconfig ***
 #-
 X86_PLATFORM_DEVICES i386=y x86_64=y
 ACER_WMI all=m
+ACERHDF all=m
 ASUS_LAPTOP i386=m x86_64=m
+DELL_LAPTOP all=m
 DELL_WMI all=m
+DELL_WMI_AIO all=m
 FUJITSU_LAPTOP all=m
 FUJITSU_LAPTOP_DEBUG all=n
 TC1100_WMI all=m
+HP_ACCEL all=m
 HP_WMI all=m
 MSI_LAPTOP i386=m x86_64=m
 PANASONIC_LAPTOP i386=m x86_64=m
 COMPAL_LAPTOP all=m
 SONY_LAPTOP i386=m x86_64=m
 SONYPI_COMPAT i386=y x86_64=y
+IDEAPAD_LAPTOP all=m
 THINKPAD_ACPI i386=m x86_64=m
+THINKPAD_ACPI_ALSA_SUPPORT all=y
 THINKPAD_ACPI_DEBUGFACILITIES all=n
 THINKPAD_ACPI_DEBUG i386=n x86_64=n
 THINKPAD_ACPI_UNSAFE_LEDS all=n
 THINKPAD_ACPI_VIDEO all=y
 THINKPAD_ACPI_HOTKEY_POLL all=y
+SENSORS_HDAPS all=m
 INTEL_MENLOW all=m
 EEEPC_LAPTOP all=m
+ASUS_WMI all=m
+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
+SAMSUNG_LAPTOP all=m
+MXM_WMI all=m
+INTEL_OAKTRAIL all=m
 
 #-
 #- *** FILE: drivers/pnp/Kconfig ***
@@ -3164,44 +3677,102 @@ POWER_SUPPLY all=m i386=y ia64=y x86_64=y
 POWER_SUPPLY_DEBUG all=n
 PDA_POWER all=m
 APM_POWER ppc=m
+WM831X_BACKUP all=m
 WM831X_POWER all=m
 WM8350_POWER all=m
+TEST_POWER all=m
 BATTERY_DS2760 all=m
+BATTERY_DS2780 all=m
 BATTERY_DS2782 all=m
 BATTERY_PMU ppc=m
+BATTERY_BQ20Z75 all=m
 BATTERY_BQ27x00 all=m
+BATTERY_BQ27X00_I2C all=y
+BATTERY_BQ27X00_PLATFORM all=y
 BATTERY_DA9030 all=m
 BATTERY_MAX17040 all=m
+BATTERY_MAX17042 all=m
 CHARGER_PCF50633 all=m
+BATTERY_INTEL_MID all=m
+CHARGER_ISP1704 all=m
+CHARGER_MAX8903 all=m
+CHARGER_GPIO all=m
 
 #-
 #- *** FILE: drivers/pps/Kconfig ***
 #-
 PPS all=m
 PPS_DEBUG all=n
+#- file drivers/pps/clients/Kconfig goes here
+#- file drivers/pps/generators/Kconfig goes here
+
+#-
+#- *** FILE: drivers/pps/clients/Kconfig ***
+#-
+#- PPS clients support
+PPS_CLIENT_KTIMER all=m
+PPS_CLIENT_LDISC all=m
+PPS_CLIENT_PARPORT all=m
+
+#-
+#- *** FILE: drivers/ptp/Kconfig ***
+#-
+#- Enable Device Drivers -> PPS to see the PTP clock options.
+PTP_1588_CLOCK all=m
+#- Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+
+#-
+#- *** FILE: drivers/rapidio/Kconfig ***
+#-
+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 ***
+#-
+RAPIDIO_TSI57X all=y
+RAPIDIO_CPS_XX all=y
+RAPIDIO_TSI568 all=y
+RAPIDIO_CPS_GEN2 all=y
+RAPIDIO_TSI500 all=y
 
 #-
 #- *** FILE: drivers/regulator/Kconfig ***
 #-
 REGULATOR all=y
 REGULATOR_DEBUG all=n
+REGULATOR_DUMMY all=y
 REGULATOR_FIXED_VOLTAGE all=m
 REGULATOR_VIRTUAL_CONSUMER all=m
 REGULATOR_USERSPACE_CONSUMER all=m
 REGULATOR_BQ24022 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_LP3971 all=m
+REGULATOR_LP3972 all=m
 REGULATOR_PCAP all=m
 REGULATOR_MC13783 all=m
+REGULATOR_MC13892 all=m
 REGULATOR_AB3100 all=m
+REGULATOR_TPS6105X all=m
 REGULATOR_TPS65023 all=m
 REGULATOR_TPS6507X all=m
+REGULATOR_ISL6271A all=m
+REGULATOR_AD5398 all=m
+REGULATOR_AB8500 all=y
+REGULATOR_TPS6586X all=m
+REGULATOR_TPS6524X all=m
 
 #-
 #- *** FILE: drivers/rtc/Kconfig ***
@@ -3221,20 +3792,26 @@ RTC_DRV_TEST all=m
 RTC_DRV_DS1307 all=m
 RTC_DRV_DS1374 all=m
 RTC_DRV_DS1672 all=m
+RTC_DRV_DS3232 all=m
 RTC_DRV_MAX6900 all=m sparc=n
 RTC_DRV_RS5C372 all=m
 RTC_DRV_ISL1208 all=m
+RTC_DRV_ISL12022 all=m
 RTC_DRV_X1205 all=m
 RTC_DRV_PCF8563 all=m
 RTC_DRV_PCF8583 all=m sparc=n
 RTC_DRV_M41T80 all=m
 RTC_DRV_M41T80_WDT all=n ia64=y
+RTC_DRV_BQ32K all=m
 RTC_DRV_TWL4030 all=m
 RTC_DRV_S35390A all=m
 RTC_DRV_FM3130 all=m
 RTC_DRV_RX8581 all=m
 RTC_DRV_RX8025 all=m
+RTC_DRV_EM3027 all=m
+RTC_DRV_RV3029C2 all=m
 #- SPI RTC drivers
+RTC_DRV_M41T93 all=m
 RTC_DRV_M41T94 all=m
 RTC_DRV_DS1305 all=m
 RTC_DRV_DS1390 all=m
@@ -3254,16 +3831,20 @@ RTC_DRV_STK17TA8 all=m
 RTC_DRV_M48T86 all=m
 RTC_DRV_M48T35 all=m
 RTC_DRV_M48T59 all=m sparc=y
+RTC_DRV_MSM6242 all=m
 RTC_DRV_BQ4802 all=m sparc64=y
+RTC_DRV_RP5C01 all=m
 RTC_DRV_V3020 all=m
 RTC_DRV_WM831X all=m
 RTC_DRV_WM8350 all=m
 RTC_DRV_PCF50633 all=m
 RTC_DRV_AB3100 all=m
+RTC_DRV_AB8500 all=m
 #- on-CPU RTC drivers
 RTC_DRV_GENERIC powerpc=y
 RTC_DRV_PS3 ppc64=m
 RTC_DRV_PCAP all=m
+RTC_DRV_MC13XXX all=m
 
 #-
 #- *** FILE: drivers/sbus/char/Kconfig ***
@@ -3309,11 +3890,14 @@ SCSI_SRP_ATTRS all=m
 SCSI_SRP_TGT_ATTRS all=y
 SCSI_LOWLEVEL all=y
 ISCSI_TCP all=m
-#- file drivers/scsi/cxgb3i/Kconfig goes here
+#- file drivers/scsi/cxgbi/Kconfig goes here
 #- file drivers/scsi/bnx2i/Kconfig goes here
+#- file drivers/scsi/bnx2fc/Kconfig goes here
 #- file drivers/scsi/be2iscsi/Kconfig goes here
 BLK_DEV_3W_XXXX_RAID all=m
+SCSI_HPSA all=m
 SCSI_3W_9XXX all=m
+SCSI_3W_SAS all=m
 SCSI_7000FASST alpha=m i386=m
 SCSI_ACARD all=m
 SCSI_AHA152X i386=m
@@ -3335,6 +3919,7 @@ SCSI_ARCMSR_AER all=y
 SCSI_HPTIOP all=m sparc=n
 SCSI_BUSLOGIC all=m
 SCSI_FLASHPOINT i386=n
+VMWARE_PVSCSI all=m
 LIBFC all=m
 FCOE all=m
 FCOE_FNIC all=m
@@ -3347,6 +3932,7 @@ SCSI_EATA_MAX_TAGS all=16 i386=62 x86_64=62
 SCSI_FUTURE_DOMAIN all=m
 SCSI_FD_MCS i386=m
 SCSI_GDTH all=m
+SCSI_ISCI all=m
 SCSI_GENERIC_NCR5380 alpha=m i386=m
 SCSI_GENERIC_NCR5380_MMIO alpha=m i386=m
 SCSI_GENERIC_NCR53C400 alpha=y i386=y
@@ -3406,6 +3992,7 @@ SCSI_MAC53C94 ppc=m
 #- file drivers/scsi/arm/Kconfig goes here
 SCSI_SUNESP sparc=m sparc64=m
 SCSI_PMCRAID all=m
+SCSI_PM8001 all=m
 SCSI_SRP all=m sparc=n
 SCSI_BFA_FC all=m
 #- file drivers/scsi/pcmcia/Kconfig goes here
@@ -3443,16 +4030,26 @@ AIC94XX_DEBUG all=n
 #-
 BE2ISCSI all=m
 
+#-
+#- *** FILE: drivers/scsi/bnx2fc/Kconfig ***
+#-
+SCSI_BNX2X_FCOE all=m
+
 #-
 #- *** FILE: drivers/scsi/bnx2i/Kconfig ***
 #-
 SCSI_BNX2_ISCSI all=m
 
 #-
-#- *** FILE: drivers/scsi/cxgb3i/Kconfig ***
+#- *** FILE: drivers/scsi/cxgbi/cxgb3i/Kconfig ***
 #-
 SCSI_CXGB3_ISCSI all=m
 
+#-
+#- *** FILE: drivers/scsi/cxgbi/cxgb4i/Kconfig ***
+#-
+SCSI_CXGB4_ISCSI all=m
+
 #-
 #- *** FILE: drivers/scsi/device_handler/Kconfig ***
 #-
@@ -3468,7 +4065,6 @@ SCSI_DH_ALUA all=m
 SCSI_SAS_LIBSAS all=m
 SCSI_SAS_ATA all=y
 SCSI_SAS_HOST_SMP all=y
-SCSI_SAS_LIBSAS_DEBUG all=n
 
 #-
 #- *** FILE: drivers/scsi/megaraid/Kconfig.megaraid ***
@@ -3520,55 +4116,6 @@ SCSI_QLA_FC all=m sparc=n
 #-
 SCSI_QLA_ISCSI all=m sparc=n
 
-#-
-#- *** FILE: drivers/serial/Kconfig ***
-#-
-SERIAL_8250 all=y
-SERIAL_8250_CONSOLE all=y
-SERIAL_8250_PCI all=y
-SERIAL_8250_PNP all=y
-SERIAL_8250_CS all=m
-SERIAL_8250_NR_UARTS all=8
-SERIAL_8250_RUNTIME_UARTS all=4
-SERIAL_8250_EXTENDED all=y
-SERIAL_8250_MANY_PORTS all=y
-SERIAL_8250_FOURPORT alpha=m i386=m
-SERIAL_8250_ACCENT alpha=m i386=m
-SERIAL_8250_BOCA alpha=m i386=m
-SERIAL_8250_EXAR_ST16C554 alpha=m i386=m
-SERIAL_8250_HUB6 alpha=m i386=m
-SERIAL_8250_SHARE_IRQ all=y
-SERIAL_8250_DETECT_IRQ all=y
-SERIAL_8250_RSA all=y
-SERIAL_8250_MCA i386=m
-#- Non-8250 serial port support
-SERIAL_MAX3100 all=m
-SERIAL_UARTLITE ppc=m
-SERIAL_SUNCORE sparc=y sparc64=y
-SERIAL_SUNZILOG sparc=y sparc64=y
-SERIAL_SUNZILOG_CONSOLE sparc=y sparc64=y
-SERIAL_SUNSU sparc=y sparc64=y
-SERIAL_SUNSU_CONSOLE sparc=y sparc64=y
-SERIAL_SUNSAB sparc=y sparc64=y
-SERIAL_SUNSAB_CONSOLE sparc=y sparc64=y
-SERIAL_SUNHV sparc64=y
-SERIAL_CORE all=y
-SERIAL_CORE_CONSOLE all=y
-SERIAL_PMACZILOG ppc=m ppc64=m
-SERIAL_PMACZILOG_TTYS all=n
-SERIAL_SGI_L1_CONSOLE ia64=y
-SERIAL_MPC52xx ppc=m
-SERIAL_ICOM ppc64=n
-SERIAL_TXX9 ppc64=y
-HAS_TXX9_SERIAL ppc64=y
-SERIAL_TXX9_NR_UARTS ppc64=6
-SERIAL_TXX9_CONSOLE ppc64=n
-SERIAL_JSM all=m sparc=n
-SERIAL_SGI_IOC4 ia64=m
-SERIAL_SGI_IOC3 ia64=m
-SERIAL_OF_PLATFORM ppc=m ppc64=m
-SERIAL_OF_PLATFORM_NWPSERIAL powerpc=m
-
 #-
 #- *** FILE: drivers/sfi/Kconfig ***
 #-
@@ -3586,11 +4133,19 @@ SPI all=y
 SPI_DEBUG all=n
 SPI_MASTER all=y
 #- SPI Master Controller Drivers
+SPI_ALTERA all=m
 SPI_BITBANG all=m
 SPI_BUTTERFLY all=m
 SPI_GPIO all=m
 SPI_LM70_LLP all=m
 SPI_MPC52xx_PSC ppc=m
+SPI_OC_TINY all=m
+SPI_PXA2XX all=m
+SPI_TOPCLIFF_PCH all=m
+SPI_XILINX all=m
+SPI_DESIGNWARE all=y
+SPI_DW_PCI all=m
+SPI_DW_MID_DMA all=y
 #- SPI Protocol Masters
 SPI_SPIDEV all=m sparc=n
 SPI_TLE62X0 all=m
@@ -3601,89 +4156,253 @@ SPI_TLE62X0 all=m
 SSB all=m
 SSB_PCMCIAHOST all=y
 SSB_SDIOHOST sparc=y
+SSB_SILENT all=n
 SSB_DEBUG all=n
 
 #-
 #- *** FILE: drivers/staging/Kconfig ***
 #-
 STAGING all=y
-STAGING_EXCLUDE_BUILD all=n
+#- file drivers/staging/tty/Kconfig goes here
+#- file drivers/staging/generic_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/poch/Kconfig goes here
-#- file drivers/staging/otus/Kconfig goes here
-#- file drivers/staging/rt2860/Kconfig goes here
-#- file drivers/staging/rt2870/Kconfig goes here
-#- file drivers/staging/rt3090/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
 #- file drivers/staging/panel/Kconfig goes here
-#- file drivers/staging/altpciechdma/Kconfig goes here
 #- file drivers/staging/rtl8187se/Kconfig goes here
-#- file drivers/staging/rtl8192su/Kconfig goes here
+#- file drivers/staging/rtl8192u/Kconfig goes here
 #- file drivers/staging/rtl8192e/Kconfig goes here
-#- file drivers/staging/mimio/Kconfig goes here
+#- file drivers/staging/rtl8712/Kconfig goes here
+#- file drivers/staging/rts_pstor/Kconfig goes here
 #- file drivers/staging/frontier/Kconfig goes here
-#- file drivers/staging/android/Kconfig goes here
-#- file drivers/staging/dream/Kconfig goes here
-#- file drivers/staging/dst/Kconfig goes here
 #- file drivers/staging/pohmelfs/Kconfig goes here
-#- file drivers/staging/b3dfg/Kconfig goes here
 #- file drivers/staging/phison/Kconfig goes here
-#- file drivers/staging/p9auth/Kconfig goes here
 #- file drivers/staging/line6/Kconfig goes here
-#- file drivers/gpu/drm/radeon/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/udlfb/Kconfig goes here
 #- file drivers/staging/hv/Kconfig goes here
 #- file drivers/staging/vme/Kconfig goes here
-#- file drivers/staging/rar/Kconfig goes here
 #- file drivers/staging/sep/Kconfig goes here
 #- file drivers/staging/iio/Kconfig goes here
+#- file drivers/staging/cs5535_gpio/Kconfig goes here
+#- file drivers/staging/zram/Kconfig goes here
+#- file drivers/staging/zcache/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/msm/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/westbridge/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/altera-stapl/Kconfig ***
+#-
+#- Altera FPGA firmware download module
+ALTERA_STAPL all=m
 
 #-
-#- *** FILE: drivers/staging/altpciechdma/Kconfig ***
+#- *** FILE: drivers/staging/asus_oled/Kconfig ***
 #-
-ALTERA_PCIE_CHDMA all=m
+ASUS_OLED all=m
 
 #-
-#- *** FILE: drivers/staging/android/Kconfig ***
+#- *** FILE: drivers/staging/ath6kl/Kconfig ***
 #-
-ANDROID all=n
-ANDROID_BINDER_IPC all=n
-ANDROID_LOGGER all=n
-ANDROID_RAM_CONSOLE all=n
-ANDROID_TIMED_GPIO all=n
-ANDROID_LOW_MEMORY_KILLER all=n
+ATH6K_LEGACY all=n
 
 #-
-#- *** FILE: drivers/staging/asus_oled/Kconfig ***
+#- *** FILE: drivers/staging/bcm/Kconfig ***
 #-
-ASUS_OLED all=m
+BCM_WIMAX all=m
 
 #-
-#- *** FILE: drivers/staging/b3dfg/Kconfig ***
+#- *** FILE: drivers/staging/brcm80211/Kconfig ***
 #-
-B3DFG all=m
+BRCMUTIL all=m
+BRCMSMAC all=m
+BRCMFMAC all=n
+BRCMDBG all=n
 
 #-
 #- *** FILE: drivers/staging/comedi/Kconfig ***
 #-
 COMEDI all=m ppc=n
 COMEDI_DEBUG all=n
+COMEDI_MISC_DRIVERS all=m
+COMEDI_KCOMEDILIB all=m
+COMEDI_BOND all=m
+COMEDI_TEST all=m
+COMEDI_PARPORT all=m
+COMEDI_SERIAL2002 all=m
+COMEDI_SKEL all=m
+COMEDI_ISA_DRIVERS all=m
+COMEDI_ACL7225B i386=m
+COMEDI_PCL711 i386=m
+COMEDI_PCL724 i386=m
+COMEDI_PCL725 i386=m
+COMEDI_PCL726 i386=m
+COMEDI_PCL730 i386=m
+COMEDI_PCL812 i386=m
+COMEDI_PCL816 i386=m
+COMEDI_PCL818 i386=m
+COMEDI_PCM3724 i386=m
+COMEDI_PCM3730 i386=m
+COMEDI_RTI800 i386=m
+COMEDI_RTI802 i386=m
+COMEDI_DAS16M1 i386=m
+COMEDI_DAS16 i386=m
+COMEDI_DAS800 i386=m
+COMEDI_DAS1800 i386=m
+COMEDI_DAS6402 i386=m
+COMEDI_DT2801 i386=m
+COMEDI_DT2811 i386=m
+COMEDI_DT2814 i386=m
+COMEDI_DT2815 i386=m
+COMEDI_DT2817 i386=m
+COMEDI_DT282X i386=m
+COMEDI_DMM32AT i386=m
+COMEDI_FL512 i386=m
+COMEDI_AIO_AIO12_8 i386=m
+COMEDI_AIO_IIRO_16 i386=m
+COMEDI_C6XDIGIO i386=m
+COMEDI_MPC624 i386=m
+COMEDI_ADQ12B i386=m
+COMEDI_NI_AT_A2150 i386=m
+COMEDI_NI_AT_AO i386=m
+COMEDI_NI_ATMIO i386=m
+COMEDI_NI_ATMIO16D i386=m
+COMEDI_PCMAD i386=m
+COMEDI_PCMDA12 i386=m
+COMEDI_PCMMIO i386=m
+COMEDI_PCMUIO i386=m
+COMEDI_MULTIQ3 i386=m
+COMEDI_POC i386=m
 COMEDI_PCI_DRIVERS all=m
+COMEDI_ADDI_APCI_035 all=m
+COMEDI_ADDI_APCI_1032 all=m
+COMEDI_ADDI_APCI_1500 all=m
+COMEDI_ADDI_APCI_1516 all=m
+COMEDI_ADDI_APCI_1564 all=m
+COMEDI_ADDI_APCI_16XX all=m
+COMEDI_ADDI_APCI_2016 all=m
+COMEDI_ADDI_APCI_2032 all=m
+COMEDI_ADDI_APCI_2200 all=m
+COMEDI_ADDI_APCI_3001 all=m
+COMEDI_ADDI_APCI_3120 all=m
+COMEDI_ADDI_APCI_3501 all=m
+COMEDI_ADDI_APCI_3XXX all=m
+COMEDI_ADL_PCI6208 all=m
+COMEDI_ADL_PCI7230 all=m
+COMEDI_ADL_PCI7296 all=m
+COMEDI_ADL_PCI7432 all=m
+COMEDI_ADL_PCI8164 all=m
+COMEDI_ADL_PCI9111 all=m
+COMEDI_ADL_PCI9118 all=m
+COMEDI_ADV_PCI1710 all=m
+COMEDI_ADV_PCI1723 all=m
+COMEDI_ADV_PCI_DIO all=m
+COMEDI_AMPLC_DIO200 all=m
+COMEDI_AMPLC_PC236 all=m
+COMEDI_AMPLC_PC263 all=m
+COMEDI_AMPLC_PCI224 all=m
+COMEDI_AMPLC_PCI230 all=m
+COMEDI_CONTEC_PCI_DIO all=m
+COMEDI_DT3000 all=m
+COMEDI_UNIOXX5 all=m
+COMEDI_GSC_HPDI all=m
+COMEDI_ICP_MULTI all=m
+COMEDI_II_PCI20KC all=m
+COMEDI_DAQBOARD2000 all=m
+COMEDI_JR3_PCI all=m
+COMEDI_KE_COUNTER all=m
+COMEDI_CB_PCIDAS64 all=m
+COMEDI_CB_PCIDAS all=m
+COMEDI_CB_PCIDDA all=m
+COMEDI_CB_PCIDIO all=m
+COMEDI_CB_PCIMDAS all=m
+COMEDI_CB_PCIMDDA all=m
+COMEDI_ME4000 all=m
+COMEDI_ME_DAQ all=m
+COMEDI_NI_6527 all=m
+COMEDI_NI_65XX all=m
+COMEDI_NI_660X all=m
+COMEDI_NI_670X all=m
+COMEDI_NI_PCIDIO all=m
+COMEDI_NI_PCIMIO all=m
+COMEDI_RTD520 all=m
+COMEDI_S526 all=m
+COMEDI_S626 all=m
+COMEDI_SSV_DNP all=m
 COMEDI_PCMCIA_DRIVERS all=m
+COMEDI_CB_DAS16_CS all=m
+COMEDI_DAS08_CS all=m
+COMEDI_NI_DAQ_700_CS all=m
+COMEDI_NI_DAQ_DIO24_CS all=m
+COMEDI_NI_LABPC_CS all=m
+COMEDI_NI_MIO_CS all=m
+COMEDI_QUATECH_DAQP_CS all=m
 COMEDI_USB_DRIVERS all=m
+COMEDI_DT9812 all=m
+COMEDI_USBDUX all=m
+COMEDI_USBDUXFAST all=m
+COMEDI_VMK80XX all=m
+COMEDI_NI_COMMON all=m
+COMEDI_MITE all=m
+COMEDI_NI_TIO all=m
+COMEDI_NI_LABPC all=m
+
+#-
+#- *** FILE: drivers/staging/cptm1217/Kconfig ***
+#-
+TOUCHSCREEN_CLEARPAD_TM1217 all=m
+
+#-
+#- *** FILE: drivers/staging/crystalhd/Kconfig ***
+#-
+CRYSTALHD all=m
+
+#-
+#- *** FILE: drivers/staging/cs5535_gpio/Kconfig ***
+#-
+CS5535_GPIO i386=m
 
 #-
 #- *** FILE: drivers/staging/cx25821/Kconfig ***
@@ -3692,17 +4411,29 @@ VIDEO_CX25821 all=m
 VIDEO_CX25821_ALSA all=m
 
 #-
-#- *** FILE: drivers/staging/dream/Kconfig ***
+#- *** 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 ***
 #-
-#- file drivers/staging/dream/smd/Kconfig goes here
-#- file drivers/staging/dream/camera/Kconfig goes here
-INPUT_GPIO all=m
+VIDEO_DT3155 all=m
+DT3155_CCIR all=y
 
 #-
-#- *** FILE: drivers/staging/dst/Kconfig ***
+#- *** FILE: drivers/staging/easycap/Kconfig ***
 #-
-DST all=m
-DST_DEBUG all=n
+EASYCAP all=m
+EASYCAP_SND all=y
+EASYCAP_OSS all=n
+EASYCAP_DEBUG all=n
 
 #-
 #- *** FILE: drivers/staging/echo/Kconfig ***
@@ -3720,6 +4451,25 @@ ET131X_DEBUG all=n
 #-
 TRANZPORT all=m
 
+#-
+#- *** FILE: drivers/staging/ft1000/Kconfig ***
+#-
+FT1000 all=m
+FT1000_USB all=m
+FT1000_PCMCIA all=m
+
+#-
+#- *** FILE: drivers/staging/generic_serial/Kconfig ***
+#-
+SX all=m
+RIO all=m
+RIO_OLDPCI all=n ia64=y ppc=y ppc64=y
+
+#-
+#- *** FILE: drivers/staging/gma500/Kconfig ***
+#-
+DRM_PSB all=m
+
 #-
 #- *** FILE: drivers/staging/go7007/Kconfig ***
 #-
@@ -3741,6 +4491,8 @@ 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 ***
@@ -3748,31 +4500,145 @@ HYPERV_NET all=m
 IIO all=m
 IIO_RING_BUFFER all=y
 IIO_SW_RING all=m
+IIO_KFIFO_BUF all=m
 IIO_TRIGGER all=y
+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/dac/Kconfig goes here
+#- file drivers/staging/iio/dds/Kconfig goes here
+#- file drivers/staging/iio/gyro/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
 
 #-
 #- *** FILE: drivers/staging/iio/accel/Kconfig ***
 #-
 #- Accelerometers
+ADIS16201 all=m
+ADIS16203 all=m
+ADIS16204 all=m
+ADIS16209 all=m
+ADIS16220 all=m
+ADIS16240 all=m
 KXSD9 all=m
 LIS3L02DQ all=m
+LIS3L02DQ_BUF_KFIFO all=y
+LIS3L02DQ_BUF_RING_SW all=n
 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
+AD799X all=m
+AD7476 all=m
+AD7887 all=m
+AD7780 all=m
+AD7745 all=m
+AD7816 all=m
+ADT75 all=m
+ADT7310 all=m
+ADT7410 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/dac/Kconfig ***
+#-
+#- Digital to analog convertors
+AD5624R_SPI all=m
+AD5446 all=m
+AD5504 all=m
+AD5791 all=m
+MAX517 all=m
+
+#-
+#- *** FILE: drivers/staging/iio/dds/Kconfig ***
+#-
+#- Direct Digital Synthesis
+AD5930 all=m
+AD9832 all=m
+AD9834 all=m
+AD9850 all=m
+AD9852 all=m
+AD9910 all=m
+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/imu/Kconfig ***
+#-
+#- Inertial measurement units
+ADIS16400 all=m
 
 #-
 #- *** FILE: drivers/staging/iio/light/Kconfig ***
 #-
 #- Light sensors
-TSL2561 all=m
+SENSORS_ISL29018 all=m
+SENSORS_TSL2563 all=m
+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
+ADE7759 all=m
+ADE7854 all=m
+ADE7854_I2C all=m
+ADE7854_SPI all=m
+
+#-
+#- *** FILE: drivers/staging/iio/resolver/Kconfig ***
+#-
+#- Resolver to digital converters
+AD2S90 all=m
+AD2S120X all=m
+AD2S1210 all=m
+AD2S1210_GPIO_INPUT all=n
+AD2S1210_GPIO_OUTPUT all=n
+AD2S1210_GPIO_NONE all=y
 
 #-
 #- *** FILE: drivers/staging/iio/trigger/Kconfig ***
@@ -3780,26 +4646,49 @@ TSL2561 all=m
 #- Triggers - standalone
 IIO_PERIODIC_RTC_TRIGGER all=m
 IIO_GPIO_TRIGGER all=m
+IIO_SYSFS_TRIGGER all=m
 
 #-
-#- *** FILE: drivers/staging/line6/Kconfig ***
+#- *** FILE: drivers/staging/intel_sst/Kconfig ***
 #-
-LINE6_USB all=m
+SND_INTEL_SST all=m
+SND_INTELMID all=n
+
+#-
+#- *** FILE: drivers/staging/keucr/Kconfig ***
+#-
+USB_ENESTORAGE all=m
 
 #-
-#- *** FILE: drivers/staging/mimio/Kconfig ***
+#- *** FILE: drivers/staging/line6/Kconfig ***
 #-
-INPUT_MIMIO all=m
+LINE6_USB all=m
+LINE6_USB_DEBUG all=n
+LINE6_USB_DUMP_CTRL all=n
+LINE6_USB_DUMP_MIDI all=n
+LINE6_USB_DUMP_PCM all=n
+LINE6_USB_RAW all=n
+LINE6_USB_IMPULSE_RESPONSE all=n
 
 #-
-#- *** FILE: drivers/staging/otus/Kconfig ***
+#- *** FILE: drivers/staging/lirc/Kconfig ***
 #-
-OTUS all=m
+LIRC_STAGING all=y
+LIRC_BT829 all=m
+LIRC_IGORPLUGUSB all=m
+LIRC_IMON all=m
+LIRC_PARALLEL all=m
+LIRC_SASEM all=m
+LIRC_SERIAL all=m
+LIRC_SERIAL_TRANSMITTER all=y
+LIRC_SIR all=m
+LIRC_TTUSBIR all=m
+LIRC_ZILOG all=m
 
 #-
-#- *** FILE: drivers/staging/p9auth/Kconfig ***
+#- *** FILE: drivers/staging/mei/Kconfig ***
 #-
-PLAN9AUTH all=m
+INTEL_MEI all=m
 
 #-
 #- *** FILE: drivers/staging/panel/Kconfig ***
@@ -3814,11 +4703,6 @@ PANEL_CHANGE_MESSAGE all=n
 #-
 IDE_PHISON all=m
 
-#-
-#- *** FILE: drivers/staging/poch/Kconfig ***
-#-
-POCH all=m
-
 #-
 #- *** FILE: drivers/staging/pohmelfs/Kconfig ***
 #-
@@ -3832,39 +4716,41 @@ POHMELFS_CRYPTO all=y
 USB_SERIAL_QUATECH_USB2 all=m
 
 #-
-#- *** FILE: drivers/staging/rar/Kconfig ***
+#- *** FILE: drivers/staging/quickstart/Kconfig ***
 #-
-RAR_REGISTER all=m
+ACPI_QUICKSTART all=m
 
 #-
-#- *** FILE: drivers/staging/rt2860/Kconfig ***
+#- *** FILE: drivers/staging/rtl8187se/Kconfig ***
 #-
-RT2860 all=m
+R8187SE all=m
 
 #-
-#- *** FILE: drivers/staging/rt2870/Kconfig ***
+#- *** FILE: drivers/staging/rtl8192e/Kconfig ***
 #-
-RT2870 all=m
+RTL8192E all=m
 
 #-
-#- *** FILE: drivers/staging/rt3090/Kconfig ***
+#- *** FILE: drivers/staging/rtl8192u/Kconfig ***
 #-
-RT3090 all=m
+RTL8192U all=m
 
 #-
-#- *** FILE: drivers/staging/rtl8187se/Kconfig ***
+#- *** FILE: drivers/staging/rtl8712/Kconfig ***
 #-
-RTL8187SE all=m
+R8712U all=m
+R8712_AP all=y
 
 #-
-#- *** FILE: drivers/staging/rtl8192e/Kconfig ***
+#- *** FILE: drivers/staging/rts_pstor/Kconfig ***
 #-
-RTL8192E all=m
+RTS_PSTOR all=m
+RTS_PSTOR_DEBUG all=n
 
 #-
-#- *** FILE: drivers/staging/rtl8192su/Kconfig ***
+#- *** FILE: drivers/staging/sbe-2t3e3/Kconfig ***
 #-
-RTL8192SU all=m
+SBE_2T3E3 all=m
 
 #-
 #- *** FILE: drivers/staging/sep/Kconfig ***
@@ -3882,16 +4768,72 @@ USB_SERIAL_QUATECH2 all=m
 SLICOSS all=m
 
 #-
-#- *** FILE: drivers/staging/udlfb/Kconfig ***
+#- *** FILE: drivers/staging/sm7xx/Kconfig ***
 #-
-FB_UDL all=m
+FB_SM7XX all=m
+
+#-
+#- *** FILE: drivers/staging/solo6x10/Kconfig ***
+#-
+SOLO6X10 all=m
+
+#-
+#- *** FILE: drivers/staging/speakup/Kconfig ***
+#-
+SPEAKUP all=m
+SPEAKUP_SYNTH_ACNTSA all=m
+SPEAKUP_SYNTH_ACNTPC all=m
+SPEAKUP_SYNTH_APOLLO all=m
+SPEAKUP_SYNTH_AUDPTR all=m
+SPEAKUP_SYNTH_BNS all=m
+SPEAKUP_SYNTH_DECTLK all=m
+SPEAKUP_SYNTH_DECEXT all=m
+SPEAKUP_SYNTH_DECPC all=m
+SPEAKUP_SYNTH_DTLK all=m
+SPEAKUP_SYNTH_KEYPC all=m
+SPEAKUP_SYNTH_LTLK all=m
+SPEAKUP_SYNTH_SOFT all=m
+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 ***
+#-
+VIDEO_TM6000 all=m
+VIDEO_TM6000_ALSA all=m
+VIDEO_TM6000_DVB all=m
+
+#-
+#- *** FILE: drivers/staging/tty/Kconfig ***
+#-
+STALLION all=m
+ISTALLION all=m
+DIGIEPCA all=m
+RISCOM8 all=m
+SPECIALIX all=m
+COMPUTONE all=m
 
 #-
 #- *** FILE: drivers/staging/usbip/Kconfig ***
 #-
-USB_IP_COMMON all=m
-USB_IP_VHCI_HCD all=m
-USB_IP_HOST all=m
+USBIP_CORE all=m
+USBIP_VHCI_HCD all=m
+USBIP_HOST all=m
+USBIP_DEBUG all=n
 
 #-
 #- *** FILE: drivers/staging/vme/Kconfig ***
@@ -3899,6 +4841,13 @@ USB_IP_HOST all=m
 VME_BUS all=m
 #- file drivers/staging/vme/bridges/Kconfig goes here
 #- file drivers/staging/vme/devices/Kconfig goes here
+#- file drivers/staging/vme/boards/Kconfig goes here
+
+#-
+#- *** FILE: drivers/staging/vme/boards/Kconfig ***
+#-
+#- VME Board Drivers
+VMIVME_7805 all=m
 
 #-
 #- *** FILE: drivers/staging/vme/bridges/Kconfig ***
@@ -3928,11 +4877,59 @@ VT6656 all=m
 #-
 W35UND all=m
 
+#-
+#- *** FILE: drivers/staging/wlags49_h2/Kconfig ***
+#-
+WLAGS49_H2 all=m
+
+#-
+#- *** FILE: drivers/staging/wlags49_h25/Kconfig ***
+#-
+WLAGS49_H25 all=m
+
 #-
 #- *** FILE: drivers/staging/wlan-ng/Kconfig ***
 #-
 PRISM2_USB all=m
 
+#-
+#- *** FILE: drivers/staging/xgifb/Kconfig ***
+#-
+FB_XGI all=m
+
+#-
+#- *** FILE: drivers/staging/zcache/Kconfig ***
+#-
+ZCACHE all=m
+
+#-
+#- *** FILE: drivers/staging/zram/Kconfig ***
+#-
+XVMALLOC all=y
+ZRAM all=m
+ZRAM_DEBUG all=n
+
+#-
+#- *** FILE: drivers/target/Kconfig ***
+#-
+TARGET_CORE all=m
+TCM_IBLOCK all=m
+TCM_FILEIO all=m
+TCM_PSCSI all=m
+#- file drivers/target/loopback/Kconfig goes here
+#- file drivers/target/tcm_fc/Kconfig goes here
+
+#-
+#- *** FILE: drivers/target/loopback/Kconfig ***
+#-
+LOOPBACK_TARGET all=m
+LOOPBACK_TARGET_CDB_DEBUG all=n
+
+#-
+#- *** FILE: drivers/target/tcm_fc/Kconfig ***
+#-
+TCM_FC all=m
+
 #-
 #- *** FILE: drivers/telephony/Kconfig ***
 #-
@@ -3945,6 +4942,106 @@ PHONE_IXJ_PCMCIA all=m
 #-
 THERMAL all=y
 
+#-
+#- *** FILE: drivers/tty/Kconfig ***
+#-
+VT all=y
+CONSOLE_TRANSLATIONS all=y
+VT_CONSOLE all=y
+HW_CONSOLE all=y
+VT_HW_CONSOLE_BINDING all=y
+UNIX98_PTYS all=y
+DEVPTS_MULTIPLE_INSTANCES all=y
+LEGACY_PTYS all=y
+LEGACY_PTY_COUNT all=256
+SERIAL_NONSTANDARD all=y
+ROCKETPORT all=m
+CYCLADES all=m
+CYZ_INTR all=n
+MOXA_INTELLIO all=m
+MOXA_SMARTIO all=m
+SYNCLINK all=m
+SYNCLINKMP all=m
+SYNCLINK_GT all=m
+NOZOMI all=m
+ISI all=m
+N_HDLC all=m
+N_GSM all=m
+TRACE_ROUTER all=m
+TRACE_SINK all=m
+
+#-
+#- *** FILE: drivers/tty/hvc/Kconfig ***
+#-
+HVC_DRIVER ppc64=y
+HVC_CONSOLE ppc64=n
+HVC_ISERIES ppc64=n
+HVC_RTAS ppc=y ppc64=y
+HVC_BEAT ppc64=n
+HVC_UDBG all=n
+HVCS ppc64=n
+
+#-
+#- *** FILE: drivers/tty/serial/Kconfig ***
+#-
+SERIAL_8250 all=y
+SERIAL_8250_CONSOLE all=y
+SERIAL_8250_PCI all=y
+SERIAL_8250_PNP all=y
+SERIAL_8250_CS all=m
+SERIAL_8250_NR_UARTS all=8
+SERIAL_8250_RUNTIME_UARTS all=4
+SERIAL_8250_EXTENDED all=y
+SERIAL_8250_MANY_PORTS all=y
+SERIAL_8250_FOURPORT alpha=m i386=m
+SERIAL_8250_ACCENT alpha=m i386=m
+SERIAL_8250_BOCA alpha=m i386=m
+SERIAL_8250_EXAR_ST16C554 alpha=m i386=m
+SERIAL_8250_HUB6 alpha=m i386=m
+SERIAL_8250_SHARE_IRQ all=y
+SERIAL_8250_DETECT_IRQ all=y
+SERIAL_8250_RSA all=y
+SERIAL_8250_MCA i386=m
+#- 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
+SERIAL_SUNCORE sparc=y sparc64=y
+SERIAL_SUNZILOG sparc=y sparc64=y
+SERIAL_SUNZILOG_CONSOLE sparc=y sparc64=y
+SERIAL_SUNSU sparc=y sparc64=y
+SERIAL_SUNSU_CONSOLE sparc=y sparc64=y
+SERIAL_SUNSAB sparc=y sparc64=y
+SERIAL_SUNSAB_CONSOLE sparc=y sparc64=y
+SERIAL_SUNHV sparc64=y
+SERIAL_CORE all=y
+SERIAL_CORE_CONSOLE all=y
+SERIAL_PMACZILOG ppc=m ppc64=m
+SERIAL_PMACZILOG_TTYS all=n
+SERIAL_SGI_L1_CONSOLE ia64=y
+SERIAL_MPC52xx ppc=m
+SERIAL_ICOM ppc64=n
+SERIAL_TXX9 ppc64=y
+HAS_TXX9_SERIAL ppc64=y
+SERIAL_TXX9_NR_UARTS ppc64=6
+SERIAL_TXX9_CONSOLE ppc64=n
+SERIAL_JSM all=m sparc=n
+SERIAL_SGI_IOC4 ia64=m
+SERIAL_SGI_IOC3 ia64=m
+SERIAL_OF_PLATFORM ppc=m ppc64=m
+SERIAL_OF_PLATFORM_NWPSERIAL powerpc=m
+SERIAL_TIMBERDALE all=m
+SERIAL_ALTERA_JTAGUART all=m
+SERIAL_ALTERA_UART all=m
+SERIAL_ALTERA_UART_MAXPORTS all=4
+SERIAL_ALTERA_UART_BAUDRATE all=115200
+SERIAL_IFX6X60 all=m
+SERIAL_PCH_UART all=m
+SERIAL_XILINX_PS_UART all=m
+
 #-
 #- *** FILE: drivers/uio/Kconfig ***
 #-
@@ -3952,10 +5049,10 @@ UIO all=m
 UIO_CIF all=m
 UIO_PDRV all=m
 UIO_PDRV_GENIRQ all=m
-UIO_SMX all=m
 UIO_AEC all=m
 UIO_SERCOS3 all=m
 UIO_PCI_GENERIC all=m
+UIO_NETX all=m
 
 #-
 #- *** FILE: drivers/usb/Kconfig ***
@@ -3970,6 +5067,7 @@ USB all=m sparc=n
 #- file drivers/usb/wusbcore/Kconfig goes here
 #- file drivers/usb/host/Kconfig goes here
 #- file drivers/usb/musb/Kconfig goes here
+#- file drivers/usb/renesas_usbhs/Kconfig goes here
 #- file drivers/usb/class/Kconfig goes here
 #- file drivers/usb/storage/Kconfig goes here
 #- file drivers/usb/image/Kconfig goes here
@@ -4023,22 +5121,25 @@ USB_GADGET_DEBUG_FS all=n
 USB_GADGET_VBUS_DRAW all=2
 USB_GADGET_SELECTED all=y
 USB_GADGET_AT91 all=n
-USB_GADGET_ATMEL_USBA ia64=n sparc64=n
+USB_GADGET_ATMEL_USBA all=n
 USB_GADGET_FSL_USB2 all=n
-USB_GADGET_LH7A40X all=n
+USB_GADGET_FUSB300 all=n
 USB_GADGET_OMAP all=n
 USB_GADGET_R8A66597 all=n
 USB_GADGET_S3C2410 all=n
+USB_GADGET_PXA_U2O all=n
 USB_GADGET_MUSB_HDRC all=n
 USB_GADGET_M66592 all=n
-USB_GADGET_AMD5536UDC all=n sparc64=y
-USB_AMD5536UDC sparc64=m
-USB_GADGET_CI13XXX all=n
-USB_GADGET_NET2280 all=y sparc64=n
+USB_GADGET_AMD5536UDC all=n
+USB_AMD5536UDC all=m
+USB_GADGET_CI13XXX_PCI all=n
+USB_GADGET_NET2280 all=n
 USB_NET2280 all=m
 USB_GADGET_GOKU all=n
 USB_GADGET_LANGWELL all=n
-USB_GADGET_DUMMY_HCD all=n
+USB_GADGET_EG20T all=n
+USB_GADGET_DUMMY_HCD all=y
+USB_DUMMY_HCD all=m
 USB_GADGET_DUALSPEED all=y
 USB_ZERO all=m
 USB_ZERO_HNPTEST all=n
@@ -4046,13 +5147,28 @@ USB_AUDIO all=m
 USB_ETH all=m
 USB_ETH_RNDIS all=y
 USB_ETH_EEM all=y
+USB_G_NCM all=m
 USB_GADGETFS all=m
+USB_FUNCTIONFS all=m
+USB_FUNCTIONFS_ETH all=y
+USB_FUNCTIONFS_RNDIS all=y
+USB_FUNCTIONFS_GENERIC all=y
 USB_FILE_STORAGE all=m
 USB_FILE_STORAGE_TEST all=n
+USB_MASS_STORAGE all=m
 USB_G_SERIAL all=m
 USB_MIDI_GADGET all=m
 USB_G_PRINTER all=m
 USB_CDC_COMPOSITE all=m
+USB_G_NOKIA all=m
+USB_G_MULTI all=m
+USB_G_MULTI_RNDIS all=y
+USB_G_MULTI_CDC all=y
+USB_G_HID all=m
+USB_G_DBGP all=m
+USB_G_DBGP_PRINTK all=y
+USB_G_DBGP_SERIAL all=n
+USB_G_WEBCAM all=m
 
 #-
 #- *** FILE: drivers/usb/host/Kconfig ***
@@ -4084,6 +5200,7 @@ USB_OHCI_LITTLE_ENDIAN all=y
 USB_UHCI_HCD all=m
 USB_U132_HCD all=m
 USB_SL811_HCD all=m
+USB_SL811_HCD_ISO all=y
 USB_SL811_CS all=m
 USB_R8A66597_HCD all=m
 USB_WHCI_HCD all=m
@@ -4107,7 +5224,6 @@ USB_SEVSEG all=m
 USB_RIO500 all=m
 USB_LEGOTOWER all=m
 USB_LCD all=m
-USB_BERRY_CHARGE all=m
 USB_LED all=m
 USB_CYPRESS_CY7C63 all=m
 USB_CYTHERM all=m
@@ -4120,7 +5236,7 @@ USB_TRANCEVIBRATOR all=m
 USB_IOWARRIOR all=m
 USB_TEST all=m
 USB_ISIGHTFW all=m
-USB_VST all=m
+USB_YUREX all=m
 
 #-
 #- *** FILE: drivers/usb/misc/sisusbvga/Kconfig ***
@@ -4138,10 +5254,6 @@ USB_MON all=m
 #-
 #- Enable Host or Gadget support to see Inventra options
 USB_MUSB_HDRC all=n
-#- DaVinci 35x and 644x USB support
-#- OMAP 243x high speed USB support
-#- OMAP 343x high speed USB support
-#- Blackfin high speed USB Support
 
 #-
 #- *** FILE: drivers/usb/otg/Kconfig ***
@@ -4150,6 +5262,8 @@ 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
 
 #-
 #- *** FILE: drivers/usb/serial/Kconfig ***
@@ -4194,11 +5308,13 @@ USB_SERIAL_KLSI all=m
 USB_SERIAL_KOBIL_SCT all=m
 USB_SERIAL_MCT_U232 all=m
 USB_SERIAL_MOS7720 all=m
+USB_SERIAL_MOS7715_PARPORT all=y
 USB_SERIAL_MOS7840 all=m
 USB_SERIAL_MOTOROLA all=m
 USB_SERIAL_NAVMAN all=m
 USB_SERIAL_PL2303 all=m
 USB_SERIAL_OTI6858 all=m
+USB_SERIAL_QCAUX all=m
 USB_SERIAL_QUALCOMM all=m
 USB_SERIAL_SPCP8X5 all=m
 USB_SERIAL_HP4X all=m
@@ -4213,6 +5329,9 @@ USB_SERIAL_XIRCOM all=m
 USB_SERIAL_OPTION all=m
 USB_SERIAL_OMNINET all=m
 USB_SERIAL_OPTICON all=m
+USB_SERIAL_VIVOPAY_SERIAL all=m
+USB_SERIAL_ZIO all=m
+USB_SERIAL_SSU100 all=m
 USB_SERIAL_DEBUG all=m
 
 #-
@@ -4222,6 +5341,7 @@ USB_SERIAL_DEBUG all=m
 #- also be needed; see USB_STORAGE Help for more info
 USB_STORAGE all=m
 USB_STORAGE_DEBUG all=n
+USB_STORAGE_REALTEK all=m
 USB_STORAGE_DATAFAB all=m
 USB_STORAGE_FREECOM all=m
 USB_STORAGE_ISD200 all=m
@@ -4233,6 +5353,8 @@ USB_STORAGE_ALAUDA all=m
 USB_STORAGE_ONETOUCH all=m
 USB_STORAGE_KARMA all=m
 USB_STORAGE_CYPRESS_ATACB all=m
+USB_STORAGE_ENE_UB6250 all=m
+USB_UAS all=m
 USB_LIBUSUAL all=y
 
 #-
@@ -4247,9 +5369,12 @@ USB_WUSB_CBAF_DEBUG all=n
 #-
 UWB all=m
 UWB_WHCI sparc=m
-UWB_WLP all=m
 UWB_I1480U all=m
-UWB_I1480U_WLP all=m
+
+#-
+#- *** FILE: drivers/vhost/Kconfig ***
+#-
+VHOST_NET all=m
 
 #-
 #- *** FILE: drivers/video/Kconfig ***
@@ -4257,6 +5382,8 @@ UWB_I1480U_WLP all=m
 #- file drivers/char/agp/Kconfig goes here
 #- file drivers/gpu/vga/Kconfig goes here
 #- file drivers/gpu/drm/Kconfig goes here
+#- file drivers/gpu/misc/Kconfig goes here
+#- file drivers/gpu/stub/Kconfig goes here
 VGASTATE all=m
 VIDEO_OUTPUT_CONTROL all=m
 FB all=y
@@ -4276,6 +5403,7 @@ FB_CIRRUS all=m
 FB_PM2 all=m sparc=n
 FB_PM2_FIFO_DISCONNECT all=n alpha=y
 FB_CYBER2000 all=m sparc=n
+FB_CYBER2000_DDC all=y
 FB_ARC i386=m x86_64=m
 FB_OF ppc=y ppc64=y
 FB_CONTROL ppc=y
@@ -4291,7 +5419,6 @@ FB_VESA i386=n x86_64=n
 FB_EFI all=y
 FB_N411 all=m
 FB_HGA i386=m x86_64=m
-FB_HGA_ACCEL i386=y x86_64=y
 FB_SBUS sparc=y sparc64=y
 FB_BW2 sparc=n sparc64=n
 FB_CG3 sparc=y sparc64=n
@@ -4339,6 +5466,7 @@ FB_ATY_GENERIC_LCD all=y
 FB_ATY_GX all=y sparc64=n
 FB_ATY_BACKLIGHT all=y
 FB_S3 all=m
+FB_S3_DDC all=y
 FB_SAVAGE all=m sparc=n
 FB_SAVAGE_I2C all=y sparc64=n
 FB_SAVAGE_ACCEL all=y sparc64=n x86_64=n
@@ -4346,6 +5474,8 @@ FB_SIS all=m sparc=n
 FB_SIS_300 all=y
 FB_SIS_315 all=y
 FB_VIA all=m
+FB_VIA_DIRECT_PROCFS all=n
+FB_VIA_X_COMPATIBILITY all=y
 FB_NEOMAGIC all=m
 FB_KYRO all=m
 FB_3DFX all=m sparc=n
@@ -4364,6 +5494,7 @@ FB_FSL_DIU ppc=m
 FB_TMIO all=m
 FB_TMIO_ACCELL all=y
 FB_SM501 all=m
+FB_UDL all=m
 FB_IBM_GXT4500 ppc=m ppc64=m
 FB_PS3 ppc64=y
 FB_PS3_DEFAULT_SIZE_M ppc64=18
@@ -4371,8 +5502,10 @@ FB_VIRTUAL all=n
 FB_METRONOME all=m
 FB_MB862XX all=m
 FB_MB862XX_PCI_GDC all=y
+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/backlight/Kconfig goes here
 #- file drivers/video/display/Kconfig goes here
 #- file drivers/video/console/Kconfig goes here
@@ -4383,19 +5516,25 @@ FB_BROADSHEET all=m
 #-
 BACKLIGHT_LCD_SUPPORT all=y
 LCD_CLASS_DEVICE all=m
+LCD_L4F00242T03 all=m
 LCD_LMS283GF05 all=m
 LCD_LTV350QV all=m
 LCD_TDO24M all=m
 LCD_VGG2432A4 all=m
 LCD_PLATFORM all=m
+LCD_S6E63M0 all=m
+LCD_LD9040 all=m
 BACKLIGHT_CLASS_DEVICE all=y
 BACKLIGHT_GENERIC all=m
 BACKLIGHT_PROGEAR i386=m x86_64=m
 BACKLIGHT_CARILLO_RANCH i386=m x86_64=m
 BACKLIGHT_DA903X all=m
-BACKLIGHT_MBP_NVIDIA 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
 
 #-
 #- *** FILE: drivers/video/console/Kconfig ***
@@ -4466,6 +5605,7 @@ W1_CON all=y
 W1_MASTER_MATROX all=m sparc=n
 W1_MASTER_DS2490 all=m
 W1_MASTER_DS2482 all=m
+W1_MASTER_DS1WM all=m
 W1_MASTER_GPIO all=m
 
 #-
@@ -4473,9 +5613,13 @@ W1_MASTER_GPIO all=m
 #-
 W1_SLAVE_THERM all=m
 W1_SLAVE_SMEM all=m
+W1_SLAVE_DS2408 all=m
+W1_SLAVE_DS2423 all=m
 W1_SLAVE_DS2431 all=m
 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_BQ27000 all=m
 
 #-
@@ -4492,6 +5636,9 @@ ACQUIRE_WDT i386=m x86_64=m
 ADVANTECH_WDT i386=m x86_64=m
 ALIM1535_WDT i386=m x86_64=m
 ALIM7101_WDT all=m
+F71808E_WDT all=m
+SP5100_TCO all=m
+GEODE_WDT all=m
 SC520_WDT i386=m x86_64=m
 SBC_FITPC2_WATCHDOG all=m
 EUROTECH_WDT i386=m x86_64=m
@@ -4504,9 +5651,11 @@ ITCO_VENDOR_SUPPORT all=y
 IT8712F_WDT all=m
 IT87_WDT all=m
 HP_WATCHDOG all=m
+HPWDT_NMI_DECODING all=y
 SC1200_WDT i386=m x86_64=m
 SCx200_WDT i386=m
 PC87413_WDT i386=m x86_64=m
+NV_TCO all=m
 60XX_WDT i386=m x86_64=m
 SBC8360_WDT i386=m x86_64=m
 SBC7240_WDT all=m
@@ -4539,6 +5688,7 @@ USBPCWATCHDOG all=m
 #-
 9P_FS all=m
 9P_FSCACHE all=y
+9P_FS_POSIX_ACL all=y
 
 #-
 #- *** FILE: fs/Kconfig ***
@@ -4552,15 +5702,16 @@ FS_XIP all=y
 FS_MBCACHE all=m
 #- file fs/reiserfs/Kconfig goes here
 #- file fs/jfs/Kconfig goes here
-FS_POSIX_ACL all=y
 #- file fs/xfs/Kconfig goes here
 #- file fs/gfs2/Kconfig goes here
 #- file fs/ocfs2/Kconfig goes here
 #- file fs/btrfs/Kconfig goes here
 #- file fs/nilfs2/Kconfig goes here
+FS_POSIX_ACL all=y
+EXPORTFS all=m
+FILE_LOCKING all=y
 #- file fs/notify/Kconfig goes here
 #- file fs/quota/Kconfig goes here
-#- file fs/autofs/Kconfig goes here
 #- file fs/autofs4/Kconfig goes here
 #- file fs/fuse/Kconfig goes here
 CUSE all=m
@@ -4575,12 +5726,14 @@ GENERIC_ACL all=y
 #- file fs/sysfs/Kconfig goes here
 TMPFS all=y
 TMPFS_POSIX_ACL all=y
+TMPFS_XATTR all=y
 HUGETLBFS all=y alpha= sparc= sparc64=y
 #- file fs/configfs/Kconfig goes here
 MISC_FILESYSTEMS all=y
 #- file fs/adfs/Kconfig goes here
 #- file fs/affs/Kconfig goes here
 #- file fs/ecryptfs/Kconfig goes here
+#- file fs/unionfs/Kconfig goes here
 #- file fs/hfs/Kconfig goes here
 #- file fs/hfsplus/Kconfig goes here
 #- file fs/befs/Kconfig goes here
@@ -4588,6 +5741,7 @@ MISC_FILESYSTEMS all=y
 #- file fs/efs/Kconfig goes here
 #- file fs/jffs2/Kconfig goes here
 #- file fs/ubifs/Kconfig goes here
+#- file fs/logfs/Kconfig goes here
 #- file fs/cramfs/Kconfig goes here
 #- file fs/squashfs/Kconfig goes here
 #- file fs/freevxfs/Kconfig goes here
@@ -4596,19 +5750,20 @@ MISC_FILESYSTEMS all=y
 #- file fs/hpfs/Kconfig goes here
 #- file fs/qnx4/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
 NETWORK_FILESYSTEMS all=y
 #- file fs/nfs/Kconfig goes here
 #- file fs/nfsd/Kconfig goes here
 LOCKD all=m
 LOCKD_V4 all=y
-EXPORTFS all=m
 NFS_ACL_SUPPORT all=m
 NFS_COMMON all=y
 #- file net/sunrpc/Kconfig goes here
-#- file fs/smbfs/Kconfig goes here
+#- file fs/ceph/Kconfig goes here
 #- file fs/cifs/Kconfig goes here
 #- file fs/ncpfs/Kconfig goes here
 #- file fs/coda/Kconfig goes here
@@ -4647,9 +5802,9 @@ AFS_DEBUG all=n
 AFS_FSCACHE all=y
 
 #-
-#- *** FILE: fs/autofs/Kconfig ***
+#- *** FILE: fs/aufs/Kconfig ***
 #-
-AUTOFS_FS all=m
+AUFS_PROC_MAP all=n
 
 #-
 #- *** FILE: fs/autofs4/Kconfig ***
@@ -4680,6 +5835,11 @@ CACHEFILES all=m
 CACHEFILES_DEBUG all=n
 CACHEFILES_HISTOGRAM all=n
 
+#-
+#- *** FILE: fs/ceph/Kconfig ***
+#-
+CEPH_FS all=m
+
 #-
 #- *** FILE: fs/cifs/Kconfig ***
 #-
@@ -4691,7 +5851,8 @@ CIFS_XATTR all=y
 CIFS_POSIX all=y
 CIFS_DEBUG2 all=n
 CIFS_DFS_UPCALL all=n
-CIFS_EXPERIMENTAL all=y
+CIFS_FSCACHE all=y
+CIFS_ACL all=y
 
 #-
 #- *** FILE: fs/coda/Kconfig ***
@@ -4855,6 +6016,11 @@ JFS_SECURITY all=y
 JFS_DEBUG all=n
 JFS_STATISTICS all=y
 
+#-
+#- *** FILE: fs/logfs/Kconfig ***
+#-
+LOGFS all=m
+
 #-
 #- *** FILE: fs/minix/Kconfig ***
 #-
@@ -4882,11 +6048,14 @@ NFS_V3_ACL all=y
 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 ***
 #-
 NFSD all=m
+NFSD_DEPRECATED all=n
 NFSD_V2_ACL all=y
 NFSD_V3 all=y
 NFSD_V3_ACL all=y
@@ -4946,10 +6115,15 @@ NLS_UTF8 all=m
 #-
 DNOTIFY all=y
 
+#-
+#- *** FILE: fs/notify/fanotify/Kconfig ***
+#-
+FANOTIFY all=y
+FANOTIFY_ACCESS_PERMISSIONS all=y
+
 #-
 #- *** FILE: fs/notify/inotify/Kconfig ***
 #-
-INOTIFY all=y
 INOTIFY_USER all=y
 
 #-
@@ -4968,7 +6142,6 @@ OCFS2_FS_USERSPACE_CLUSTER all=m
 OCFS2_FS_STATS all=y
 OCFS2_DEBUG_MASKLOG all=y
 OCFS2_DEBUG_FS all=n
-OCFS2_FS_POSIX_ACL all=n
 
 #-
 #- *** FILE: fs/omfs/Kconfig ***
@@ -5011,6 +6184,11 @@ PROC_FS all=y
 PROC_KCORE all=y
 PROC_SYSCTL all=y
 
+#-
+#- *** FILE: fs/pstore/Kconfig ***
+#-
+PSTORE all=y
+
 #-
 #- *** FILE: fs/qnx4/Kconfig ***
 #-
@@ -5022,6 +6200,7 @@ QNX4FS_FS all=m
 QUOTA all=y
 QUOTA_NETLINK_INTERFACE all=y
 PRINT_QUOTA_WARNING all=y
+QUOTA_DEBUG all=n
 QFMT_V1 all=m
 QFMT_V2 all=m
 QUOTACTL all=y
@@ -5043,11 +6222,13 @@ ROMFS_FS all=y
 ROMFS_BACKED_BY_BLOCK all=y
 
 #-
-#- *** FILE: fs/smbfs/Kconfig ***
+#- *** FILE: fs/squashfs/Kconfig ***
 #-
-SMB_FS all=m
-SMB_NLS_DEFAULT all=y
-SMB_NLS_REMOTE all="iso8859-2"
+SQUASHFS all=m
+SQUASHFS_XATTR all=y
+SQUASHFS_LZO all=y
+SQUASHFS_XZ all=y
+SQUASHFS_EMBEDDED all=n
 
 #-
 #- *** FILE: fs/sysfs/Kconfig ***
@@ -5096,43 +6277,43 @@ XFS_DEBUG all=n
 #-
 DEFCONFIG_LIST all="/lib/modules/$UNAME_RELEASE/.config"
 EXPERIMENTAL all=y
-LOCK_KERNEL all=y
 INIT_ENV_ARG_LIMIT all=32
+CROSS_COMPILE all=""
 LOCALVERSION_AUTO all=y
 HAVE_KERNEL_GZIP all=y
 HAVE_KERNEL_BZIP2 all=y
 HAVE_KERNEL_LZMA all=y
+HAVE_KERNEL_XZ all=y
 KERNEL_GZIP all=n
 KERNEL_BZIP2 all=n
-KERNEL_LZMA all=y
+KERNEL_LZMA all=n
+KERNEL_XZ all=y
 KERNEL_LZO all=n
+DEFAULT_HOSTNAME all="(none)"
 SWAP all=y
 SYSVIPC all=y
 SYSVIPC_SYSCTL all=y
 POSIX_MQUEUE all=y
 BSD_PROCESS_ACCT all=y
 BSD_PROCESS_ACCT_V3 all=y
+FHANDLE all=y
 TASKSTATS all=y
 TASK_DELAY_ACCT all=y
 TASK_XACCT all=y
 TASK_IO_ACCOUNTING all=y
 AUDIT all=y
 AUDITSYSCALL all=y
+#- 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
-GROUP_SCHED all=y
-FAIR_GROUP_SCHED all=y
-RT_GROUP_SCHED all=n
-USER_SCHED all=n
-CGROUP_SCHED all=y
 CGROUPS all=y
 CGROUP_DEBUG all=n
-CGROUP_NS all=y
 CGROUP_FREEZER all=y
 CGROUP_DEVICE all=y
 CPUSETS all=y
@@ -5141,29 +6322,38 @@ CGROUP_CPUACCT all=y
 RESOURCE_COUNTERS all=y
 CGROUP_MEM_RES_CTLR all=y
 CGROUP_MEM_RES_CTLR_SWAP all=y
-SYSFS_DEPRECATED_V2 all=n
-RELAY all=y
+CGROUP_MEM_RES_CTLR_SWAP_ENABLED all=n
+CGROUP_PERF all=y
+CGROUP_SCHED all=y
+FAIR_GROUP_SCHED 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=y
+USER_NS all=n
 PID_NS all=y
 NET_NS all=y
+SCHED_AUTOGROUP all=y
+SYSFS_DEPRECATED all=n
+SYSFS_DEPRECATED_V2 all=n
+RELAY all=y
 BLK_DEV_INITRD all=y
 #- file usr/Kconfig goes here
 CC_OPTIMIZE_FOR_SIZE all=n
 SYSCTL all=y
 ANON_INODES all=y
-EMBEDDED all=n
+EXPERT all=n
 UID16 all=y
 SYSCTL_SYSCALL all=y
 KALLSYMS all=y
 KALLSYMS_ALL all=y
-KALLSYMS_EXTRA_PASS all=y
 HOTPLUG all=y
 PRINTK all=y
 BUG all=y
 ELF_CORE all=y
+PCSPKR_PLATFORM all=y
 BASE_FULL all=y
 FUTEX all=y
 EPOLL all=y
@@ -5171,18 +6361,19 @@ SIGNALFD all=y
 TIMERFD all=y
 EVENTFD all=y
 SHMEM all=y
+AIO all=y
+EMBEDDED all=n
 PERF_EVENTS all=y
-EVENT_PROFILE all=y
 PERF_COUNTERS all=y
 DEBUG_PERF_USE_VMALLOC all=n
 VM_EVENT_COUNTERS all=y
+PCI_QUIRKS all=y
 COMPAT_BRK all=n
 SLAB all=n
 SLUB all=y
 SLOB all=n
 PROFILING all=y
 #- file arch/Kconfig goes here
-SLOW_WORK_DEBUG all=n
 SLABINFO all=y
 RT_MUTEXES all=y
 BASE_SMALL all=0
@@ -5194,6 +6385,7 @@ MODVERSIONS all=n
 MODULE_SRCVERSION_ALL all=n
 STOP_MACHINE all=y
 #- file block/Kconfig goes here
+#- file kernel/Kconfig.locks goes here
 
 #-
 #- *** FILE: kernel/Kconfig.hz ***
@@ -5216,19 +6408,29 @@ PREEMPT all=n
 #-
 GCOV_KERNEL all=n
 
+#-
+#- *** FILE: kernel/irq/Kconfig ***
+#-
+GENERIC_IRQ_SHOW all=y
+IRQ_FORCED_THREADING all=y
+
 #-
 #- *** FILE: kernel/power/Kconfig ***
 #-
-PM all=y
-PM_DEBUG all=n
-PM_SLEEP_SMP all=y
-PM_SLEEP all=y
 SUSPEND all=y
 SUSPEND_FREEZER ppc=y ppc64=y
+HIBERNATE_CALLBACKS all=y
 HIBERNATION all=y
 PM_STD_PARTITION all=""
-APM_EMULATION ppc=m
+PM_SLEEP all=y
+PM_SLEEP_SMP all=y
 PM_RUNTIME all=y
+PM all=y
+PM_DEBUG all=n
+#- Image Storage (you need at least one allocator)
+#- General Options
+#- No compression support available without Cryptoapi support.
+APM_EMULATION ppc=m
 
 #-
 #- *** FILE: kernel/time/Kconfig ***
@@ -5240,25 +6442,21 @@ HIGH_RES_TIMERS all=y alpha= ia64=
 #-
 #- *** FILE: kernel/trace/Kconfig ***
 #-
+EVENT_POWER_TRACING_DEPRECATED all=y
 CONTEXT_SWITCH_TRACER all=y
 FTRACE all=y
 FUNCTION_TRACER all=n
 IRQSOFF_TRACER all=n
-SYSPROF_TRACER all=n
 SCHED_TRACER all=n
 ENABLE_DEFAULT_TRACERS all=n
 FTRACE_SYSCALLS all=n
-BOOT_TRACER all=n
 TRACE_BRANCH_PROFILING all=n
 BRANCH_PROFILE_NONE all=y
 PROFILE_ANNOTATED_BRANCHES all=n
 PROFILE_ALL_BRANCHES all=n
-POWER_TRACER all=n
 STACK_TRACER all=n
-HW_BRANCH_TRACER all=n
-KMEMTRACE all=n
-WORKQUEUE_TRACER all=n
 BLK_DEV_IO_TRACE all=n
+KPROBE_EVENT all=y
 FTRACE_STARTUP_TEST all=n
 MMIOTRACE x86=n
 RING_BUFFER_BENCHMARK all=m
@@ -5277,11 +6475,13 @@ LIBCRC32C all=m
 AUDIT_GENERIC alpha=y i386=y
 ZLIB_INFLATE all=y
 ZLIB_DEFLATE all=m
-LZO_COMPRESS all=m
-LZO_DECOMPRESS all=m
+LZO_COMPRESS all=y
+LZO_DECOMPRESS all=y
+#- file lib/xz/Kconfig goes here
 GENERIC_ALLOCATOR all=y
 REED_SOLOMON all=m
 REED_SOLOMON_DEC16 all=y
+BCH all=m
 TEXTSEARCH all=y
 TEXTSEARCH_KMP all=m
 TEXTSEARCH_BM all=m
@@ -5290,11 +6490,13 @@ HAS_IOMEM all=y
 HAS_IOPORT all=y
 HAS_DMA all=y
 CHECK_SIGNATURE all=y
+CPU_RMAP all=y
 
 #-
 #- *** FILE: lib/Kconfig.debug ***
 #-
 PRINTK_TIME all=y
+DEFAULT_MESSAGE_LOGLEVEL all=4
 ENABLE_WARN_DEPRECATED all=y
 ENABLE_MUST_CHECK all=y
 FRAME_WARN all=2048
@@ -5304,11 +6506,15 @@ UNUSED_SYMBOLS all=y
 #* required by oprofile
 DEBUG_FS all=y
 HEADERS_CHECK all=y
+DEBUG_SECTION_MISMATCH all=n
 DEBUG_KERNEL all=y
 DEBUG_SHIRQ all=n
-DETECT_SOFTLOCKUP all=y
+LOCKUP_DETECTOR all=y
+BOOTPARAM_HARDLOCKUP_PANIC all=n
+BOOTPARAM_HARDLOCKUP_PANIC_VALUE all=0
 BOOTPARAM_SOFTLOCKUP_PANIC all=n
 DETECT_HUNG_TASK all=y
+DEFAULT_HUNG_TASK_TIMEOUT all=120
 BOOTPARAM_HUNG_TASK_PANIC all=n
 SCHED_DEBUG all=n
 SCHEDSTATS all=n
@@ -5321,31 +6527,38 @@ DEBUG_KMEMLEAK all=n
 DEBUG_RT_MUTEXES all=n
 RT_MUTEX_TESTER all=n
 DEBUG_SPINLOCK all=n
-DEBUG_MUTEXES all=y ia64=n
+DEBUG_MUTEXES all=n
 DEBUG_LOCK_ALLOC all=n
 PROVE_LOCKING all=n
+SPARSE_RCU_POINTER all=n
 LOCK_STAT all=n
 DEBUG_SPINLOCK_SLEEP all=n
 DEBUG_LOCKING_API_SELFTESTS all=n
+DEBUG_STACK_USAGE all=n
 DEBUG_KOBJECT all=n
 DEBUG_HIGHMEM i386=n sparc=n
+DEBUG_BUGVERBOSE all=y
 DEBUG_INFO all=y
+DEBUG_INFO_REDUCED all=n
 DEBUG_VM all=n
 DEBUG_VIRTUAL all=n
 DEBUG_WRITECOUNT all=n
 DEBUG_LIST all=n
+TEST_LIST_SORT all=n
 DEBUG_SG all=n
 DEBUG_NOTIFIERS all=n
 DEBUG_CREDENTIALS all=n
 FRAME_POINTER i386=y x86_64=y
 BOOT_PRINTK_DELAY all=n
 RCU_TORTURE_TEST all=m
-RCU_CPU_STALL_DETECTOR all=n
+RCU_CPU_STALL_TIMEOUT all=60
 KPROBES_SANITY_TEST all=n
 BACKTRACE_SELF_TEST all=m
 DEBUG_BLOCK_EXT_DEVT all=n
 DEBUG_FORCE_WEAK_PER_CPU all=n
+DEBUG_PER_CPU_MAPS all=n
 LKDTM all=m
+CPU_NOTIFIER_ERROR_INJECT all=m
 FAULT_INJECTION all=n
 LATENCYTOP all=n
 SYSCTL_SYSCALL_CHECK all=n
@@ -5356,9 +6569,12 @@ FIREWIRE_OHCI_REMOTE_DMA all=n
 BUILD_DOCSRC all=n
 DYNAMIC_DEBUG all=n
 DMA_API_DEBUG all=n
+ATOMIC64_SELFTEST all=n
+ASYNC_RAID6_TEST all=m
 #- file samples/Kconfig goes here
 #- file lib/Kconfig.kgdb goes here
 #- file lib/Kconfig.kmemcheck goes here
+TEST_KSTRTOX all=m
 
 #-
 #- *** FILE: lib/Kconfig.kgdb ***
@@ -5367,12 +6583,26 @@ KGDB all=y
 KGDB_SERIAL_CONSOLE all=y
 KGDB_TESTS all=y
 KGDB_TESTS_ON_BOOT all=n
+KGDB_LOW_LEVEL_TRAP all=n
+KGDB_KDB all=y
+KDB_KEYBOARD all=y
 
 #-
 #- *** FILE: lib/Kconfig.kmemcheck ***
 #-
 KMEMCHECK all=n
 
+#-
+#- *** FILE: lib/xz/Kconfig ***
+#-
+XZ_DEC_X86 all=y
+XZ_DEC_POWERPC all=y
+XZ_DEC_IA64 all=y
+XZ_DEC_ARM all=y
+XZ_DEC_ARMTHUMB all=y
+XZ_DEC_SPARC all=y
+XZ_DEC_TEST all=m
+
 #-
 #- *** FILE: mm/Kconfig ***
 #-
@@ -5383,6 +6613,7 @@ SPARSEMEM_VMEMMAP all=y
 MEMORY_HOTPLUG all=y
 MEMORY_HOTREMOVE all=y
 SPLIT_PTLOCK_CPUS all=4
+COMPACTION all=y
 MIGRATION all=y
 ZONE_DMA_FLAG all=1 sparc64=0
 NR_QUICK sparc64=1
@@ -5390,6 +6621,10 @@ KSM all=y
 DEFAULT_MMAP_MIN_ADDR all=0 x86_64=65536 i386=65536 sparc64=8192 ppc=65536
 MEMORY_FAILURE all=y
 HWPOISON_INJECT all=m
+TRANSPARENT_HUGEPAGE all=y
+TRANSPARENT_HUGEPAGE_ALWAYS all=y
+TRANSPARENT_HUGEPAGE_MADVISE all=n
+CLEANCACHE all=y
 
 #-
 #- *** FILE: mm/Kconfig.debug ***
@@ -5424,6 +6659,7 @@ INET all=y
 #- file net/ipv6/Kconfig goes here
 #- file net/netlabel/Kconfig goes here
 NETWORK_SECMARK all=y
+NETWORK_PHY_TIMESTAMPING all=n
 NETFILTER all=y
 NETFILTER_DEBUG all=n
 NETFILTER_ADVANCED all=y
@@ -5438,6 +6674,7 @@ BRIDGE_NETFILTER all=y
 #- file net/rds/Kconfig goes here
 #- file net/tipc/Kconfig goes here
 #- file net/atm/Kconfig goes here
+#- file net/l2tp/Kconfig goes here
 #- file net/802/Kconfig goes here
 #- file net/bridge/Kconfig goes here
 #- file net/dsa/Kconfig goes here
@@ -5454,6 +6691,11 @@ BRIDGE_NETFILTER all=y
 #- file net/ieee802154/Kconfig goes here
 #- file net/sched/Kconfig goes here
 #- file net/dcb/Kconfig goes here
+#- file net/dns_resolver/Kconfig goes here
+#- file net/batman-adv/Kconfig goes here
+RFS_ACCEL all=y
+HAVE_BPF_JIT all=y
+BPF_JIT all=y
 NET_PKTGEN all=m
 NET_TCPPROBE all=m
 NET_DROP_MONITOR all=y
@@ -5469,6 +6711,8 @@ WIRELESS all=y
 #- file net/wimax/Kconfig goes here
 #- file net/rfkill/Kconfig goes here
 #- file net/9p/Kconfig goes here
+#- file net/caif/Kconfig goes here
+#- file net/ceph/Kconfig goes here
 
 #-
 #- *** FILE: net/atm/Kconfig ***
@@ -5492,12 +6736,18 @@ NETROM all=m
 ROSE all=m
 #- file drivers/net/hamradio/Kconfig goes here
 
+#-
+#- *** FILE: net/batman-adv/Kconfig ***
+#-
+BATMAN_ADV all=m
+BATMAN_ADV_DEBUG all=n
+
 #-
 #- *** FILE: net/bluetooth/Kconfig ***
 #-
 BT all=m
-BT_L2CAP all=m
-BT_SCO 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
@@ -5531,12 +6781,41 @@ BT_RFCOMM_TTY all=y
 #- *** FILE: net/bridge/Kconfig ***
 #-
 BRIDGE all=m
+BRIDGE_IGMP_SNOOPING all=y
 
 #-
 #- *** FILE: net/bridge/netfilter/Kconfig ***
 #-
+BRIDGE_NF_EBTABLES all=m
+BRIDGE_EBT_BROUTE all=m
+BRIDGE_EBT_T_FILTER all=m
+BRIDGE_EBT_T_NAT all=m
+BRIDGE_EBT_802_3 all=m
+BRIDGE_EBT_AMONG all=m
+BRIDGE_EBT_ARP all=m
+BRIDGE_EBT_IP all=m
+BRIDGE_EBT_IP6 all=m
+BRIDGE_EBT_LIMIT all=m
+BRIDGE_EBT_MARK all=m
+BRIDGE_EBT_PKTTYPE all=m
+BRIDGE_EBT_STP all=m
+BRIDGE_EBT_VLAN all=m
+BRIDGE_EBT_ARPREPLY all=m
+BRIDGE_EBT_DNAT all=m
+BRIDGE_EBT_MARK_T all=m
+BRIDGE_EBT_REDIRECT all=m
+BRIDGE_EBT_SNAT all=m
+BRIDGE_EBT_LOG all=m
+BRIDGE_EBT_ULOG all=m
 BRIDGE_EBT_NFLOG=m
 
+#-
+#- *** FILE: net/caif/Kconfig ***
+#-
+CAIF all=m
+CAIF_DEBUG all=n
+CAIF_NETDEV all=m
+
 #-
 #- *** FILE: net/can/Kconfig ***
 #-
@@ -5545,6 +6824,12 @@ CAN_RAW all=m
 CAN_BCM all=m
 #- file drivers/net/can/Kconfig goes here
 
+#-
+#- *** FILE: net/ceph/Kconfig ***
+#-
+CEPH_LIB all=m
+CEPH_LIB_PRETTYDEBUG all=n
+
 #-
 #- *** FILE: net/dcb/Kconfig ***
 #-
@@ -5565,7 +6850,6 @@ NET_DCCPPROBE all=m
 IP_DCCP_CCID2_DEBUG all=n
 IP_DCCP_CCID3 all=y
 IP_DCCP_CCID3_DEBUG all=n
-IP_DCCP_CCID3_RTO all=100
 IP_DCCP_TFRC_LIB all=y
 
 #-
@@ -5574,6 +6858,11 @@ IP_DCCP_TFRC_LIB all=y
 DECNET all=m
 DECNET_ROUTER all=y
 
+#-
+#- *** FILE: net/decnet/netfilter/Kconfig ***
+#-
+DECNET_NF_GRABULATOR all=m
+
 #-
 #- *** FILE: net/dsa/Kconfig ***
 #-
@@ -5599,19 +6888,21 @@ IEEE802154 all=m
 #-
 IP_MULTICAST all=y
 IP_ADVANCED_ROUTER all=y
-ASK_IP_FIB_HASH all=y
-IP_FIB_TRIE all=n
+IP_FIB_TRIE_STATS all=y
 IP_MULTIPLE_TABLES all=y
 IP_ROUTE_MULTIPATH all=y
 IP_ROUTE_VERBOSE all=y
+IP_ROUTE_CLASSID all=y
 IP_PNP all=y
 IP_PNP_DHCP all=y
 IP_PNP_BOOTP all=y
 IP_PNP_RARP all=y
 NET_IPIP all=m
+NET_IPGRE_DEMUX all=m
 NET_IPGRE all=m
 NET_IPGRE_BROADCAST all=y
 IP_MROUTE all=y
+IP_MROUTE_MULTIPLE_TABLES all=y
 IP_PIMSM_V1 all=y
 IP_PIMSM_V2 all=y
 ARPD all=n
@@ -5649,6 +6940,35 @@ DEFAULT_RENO all=n
 DEFAULT_TCP_CONG all="cubic"
 TCP_MD5SIG all=y
 
+#-
+#- *** FILE: net/ipv4/netfilter/Kconfig ***
+#-
+NF_CONNTRACK_IPV4 all=m
+NF_CONNTRACK_PROC_COMPAT all=y
+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_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
+IP_NF_TARGET_NETMAP all=m
+IP_NF_TARGET_REDIRECT all=m
+NF_NAT_SNMP_BASIC all=m
+IP_NF_MANGLE all=m
+IP_NF_TARGET_CLUSTERIP all=m
+IP_NF_TARGET_ECN all=m
+IP_NF_TARGET_TTL all=m
+IP_NF_RAW all=m
+IP_NF_SECURITY all=m
+IP_NF_ARPTABLES all=m
+IP_NF_ARPFILTER all=m
+IP_NF_ARP_MANGLE all=m
+
 #-
 #- *** FILE: net/ipv6/Kconfig ***
 #-
@@ -5673,8 +6993,31 @@ IPV6_TUNNEL all=m
 IPV6_MULTIPLE_TABLES all=y
 IPV6_SUBTREES all=y
 IPV6_MROUTE all=y
+IPV6_MROUTE_MULTIPLE_TABLES all=y
 IPV6_PIMSM_V2 all=y
 
+#-
+#- *** FILE: net/ipv6/netfilter/Kconfig ***
+#-
+NF_CONNTRACK_IPV6 all=m
+IP6_NF_QUEUE all=m
+IP6_NF_IPTABLES all=m
+IP6_NF_MATCH_AH all=m
+IP6_NF_MATCH_EUI64 all=m
+IP6_NF_MATCH_FRAG all=m
+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_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
+IP6_NF_RAW all=m
+IP6_NF_SECURITY all=m
+
 #-
 #- *** FILE: net/ipx/Kconfig ***
 #-
@@ -5711,6 +7054,15 @@ IRLAN all=m
 #-
 IRNET all=m
 
+#-
+#- *** FILE: net/l2tp/Kconfig ***
+#-
+L2TP all=m
+L2TP_DEBUGFS all=m
+L2TP_V3 all=y
+L2TP_IP all=m
+L2TP_ETH all=m
+
 #-
 #- *** FILE: net/lapb/Kconfig ***
 #-
@@ -5728,8 +7080,12 @@ LLC2 all=m
 #-
 MAC80211 all=m sparc=n
 #- CFG80211 needs to be enabled for MAC80211
+MAC80211_RC_PID all=y
 MAC80211_RC_MINSTREL all=y
+MAC80211_RC_MINSTREL_HT all=y
+MAC80211_RC_DEFAULT_PID all=n
 MAC80211_RC_DEFAULT_MINSTREL all=y
+#- Some wireless drivers require a rate control algorithm
 MAC80211_MESH all=y
 MAC80211_LEDS all=y
 MAC80211_DEBUGFS all=n
@@ -5738,16 +7094,117 @@ MAC80211_DEBUG_MENU all=n
 #-
 #- *** FILE: net/netfilter/Kconfig ***
 #-
+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_EVENTS all=y
+NF_CONNTRACK_TIMESTAMP all=y
 NF_CT_PROTO_DCCP=m
+NF_CT_PROTO_SCTP all=m
+NF_CT_PROTO_UDPLITE all=m
+NF_CONNTRACK_AMANDA all=m
+NF_CONNTRACK_FTP all=m
+NF_CONNTRACK_H323 all=m
+NF_CONNTRACK_IRC all=m
+NF_CONNTRACK_BROADCAST all=m
+NF_CONNTRACK_NETBIOS_NS all=m
+NF_CONNTRACK_SNMP all=m
+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
+NETFILTER_TPROXY all=m
+NETFILTER_XTABLES all=m
+#- Xtables combined modules
+NETFILTER_XT_MARK all=m
+NETFILTER_XT_CONNMARK all=m
+NETFILTER_XT_SET all=m
+#- Xtables targets
+NETFILTER_XT_TARGET_AUDIT all=m
+NETFILTER_XT_TARGET_CHECKSUM all=m
+NETFILTER_XT_TARGET_CLASSIFY all=m
+NETFILTER_XT_TARGET_CONNMARK all=m
+NETFILTER_XT_TARGET_CONNSECMARK all=m
+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_MARK all=m
+NETFILTER_XT_TARGET_NFLOG all=m
+NETFILTER_XT_TARGET_NFQUEUE all=m
+NETFILTER_XT_TARGET_NOTRACK all=m
 NETFILTER_XT_TARGET_RATEEST all=m
+NETFILTER_XT_TARGET_TEE all=m
+NETFILTER_XT_TARGET_TPROXY all=m
+NETFILTER_XT_TARGET_TRACE all=m
+NETFILTER_XT_TARGET_SECMARK all=m
+NETFILTER_XT_TARGET_TCPMSS all=m
 NETFILTER_XT_TARGET_TCPOPTSTRIP all=m
+#- Xtables matches
+NETFILTER_XT_MATCH_ADDRTYPE all=m
+NETFILTER_XT_MATCH_CLUSTER all=m
+NETFILTER_XT_MATCH_COMMENT all=m
+NETFILTER_XT_MATCH_CONNBYTES all=m
+NETFILTER_XT_MATCH_CONNLIMIT all=m
+NETFILTER_XT_MATCH_CONNMARK all=m
+NETFILTER_XT_MATCH_CONNTRACK all=m
+NETFILTER_XT_MATCH_CPU all=m
+NETFILTER_XT_MATCH_DCCP all=m
+NETFILTER_XT_MATCH_DEVGROUP all=m
+NETFILTER_XT_MATCH_DSCP all=m
+NETFILTER_XT_MATCH_ESP all=m
+NETFILTER_XT_MATCH_HASHLIMIT all=m
+NETFILTER_XT_MATCH_HELPER all=m
+NETFILTER_XT_MATCH_HL all=m
 NETFILTER_XT_MATCH_IPRANGE all=m
+NETFILTER_XT_MATCH_IPVS all=m
+NETFILTER_XT_MATCH_LENGTH all=m
+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_OSF all=m
 NETFILTER_XT_MATCH_OWNER all=m
+NETFILTER_XT_MATCH_POLICY all=m
+NETFILTER_XT_MATCH_PHYSDEV all=m
+NETFILTER_XT_MATCH_PKTTYPE all=m
+NETFILTER_XT_MATCH_QUOTA all=m
 NETFILTER_XT_MATCH_RATEEST all=m
+NETFILTER_XT_MATCH_REALM all=m
+NETFILTER_XT_MATCH_RECENT all=m
+NETFILTER_XT_MATCH_SCTP all=m
+NETFILTER_XT_MATCH_SOCKET all=m
+NETFILTER_XT_MATCH_STATE all=m
+NETFILTER_XT_MATCH_LAYER7_DEBUG all=n
+NETFILTER_XT_MATCH_STATISTIC all=m
+NETFILTER_XT_MATCH_STRING all=m
+NETFILTER_XT_MATCH_TCPMSS all=m
 NETFILTER_XT_MATCH_TIME all=m
-NETFILTER_XT_MATCH_OSF all=m
+NETFILTER_XT_MATCH_U32 all=m
+#- file net/netfilter/ipset/Kconfig goes here
 #- file net/netfilter/ipvs/Kconfig goes here
 
+#-
+#- *** FILE: net/netfilter/ipset/Kconfig ***
+#-
+IP_SET all=m
+IP_SET_MAX all=256
+IP_SET_BITMAP_IP all=m
+IP_SET_BITMAP_IPMAC all=m
+IP_SET_BITMAP_PORT all=m
+IP_SET_HASH_IP all=m
+IP_SET_HASH_IPPORT all=m
+IP_SET_HASH_IPPORTIP all=m
+IP_SET_HASH_IPPORTNET all=m
+IP_SET_HASH_NET all=m
+IP_SET_HASH_NETPORT all=m
+IP_SET_LIST_SET all=m
+
 #-
 #- *** FILE: net/netfilter/ipvs/Kconfig ***
 #-
@@ -5760,6 +7217,7 @@ IP_VS_PROTO_TCP all=y
 IP_VS_PROTO_UDP all=y
 IP_VS_PROTO_ESP all=y
 IP_VS_PROTO_AH all=y
+IP_VS_PROTO_SCTP all=y
 #- IPVS scheduler
 IP_VS_RR all=m
 IP_VS_WRR all=m
@@ -5772,6 +7230,8 @@ IP_VS_SH all=m
 IP_VS_SED all=m
 IP_VS_NQ all=m
 IP_VS_FTP all=m
+IP_VS_NFCT all=y
+IP_VS_PE_SIP all=m
 
 #-
 #- *** FILE: net/netlabel/Kconfig ***
@@ -5782,7 +7242,6 @@ NETLABEL all=y
 #- *** FILE: net/packet/Kconfig ***
 #-
 PACKET all=y
-PACKET_MMAP all=y
 
 #-
 #- *** FILE: net/phonet/Kconfig ***
@@ -5802,6 +7261,7 @@ RDS_DEBUG all=n
 #-
 RFKILL all=m sparc=n
 RFKILL_INPUT all=y sparc=
+RFKILL_REGULATOR all=m
 
 #-
 #- *** FILE: net/rxrpc/Kconfig ***
@@ -5822,6 +7282,7 @@ NET_SCH_ATM all=m
 NET_SCH_PRIO all=m
 NET_SCH_MULTIQ all=m
 NET_SCH_RED all=m
+NET_SCH_SFB all=m
 NET_SCH_SFQ all=m
 NET_SCH_TEQL all=m
 NET_SCH_TBF all=m
@@ -5829,13 +7290,15 @@ NET_SCH_GRED all=m
 NET_SCH_DSMARK all=m
 NET_SCH_NETEM all=m
 NET_SCH_DRR all=m
+NET_SCH_MQPRIO all=m
+NET_SCH_CHOKE all=m
+NET_SCH_QFQ all=m
 NET_SCH_INGRESS all=m
 #- Classification
 NET_CLS all=y
 NET_CLS_BASIC all=m
 NET_CLS_TCINDEX all=m
 NET_CLS_ROUTE4 all=m
-NET_CLS_ROUTE all=y
 NET_CLS_FW all=m
 NET_CLS_U32 all=m
 CLS_U32_PERF all=y
@@ -5861,6 +7324,7 @@ NET_ACT_NAT all=m
 NET_ACT_PEDIT all=m
 NET_ACT_SIMP all=m
 NET_ACT_SKBEDIT all=m
+NET_ACT_CSUM all=m
 NET_CLS_IND all=y
 NET_SCH_FIFO all=y
 
@@ -5868,6 +7332,7 @@ NET_SCH_FIFO all=y
 #- *** FILE: net/sctp/Kconfig ***
 #-
 IP_SCTP all=m
+NET_SCTPPROBE all=m
 SCTP_DBG_MSG all=n
 SCTP_DBG_OBJCNT all=n
 SCTP_HMAC_NONE all=n
@@ -5881,7 +7346,6 @@ SUNRPC all=m
 SUNRPC_GSS all=m
 SUNRPC_XPRT_RDMA all=m
 RPCSEC_GSS_KRB5 all=m
-RPCSEC_GSS_SPKM3 all=m
 
 #-
 #- *** FILE: net/tipc/Kconfig ***
@@ -5909,14 +7373,15 @@ WIMAX_DEBUG_LEVEL all=8
 #-
 #- *** FILE: net/wireless/Kconfig ***
 #-
+WIRELESS_EXT all=y
 CFG80211 all=m sparc=n
 NL80211_TESTMODE all=y
 CFG80211_DEVELOPER_WARNINGS all=n
 CFG80211_REG_DEBUG all=n
 CFG80211_DEFAULT_PS all=y
 CFG80211_DEBUGFS all=n
-WIRELESS_OLD_REGULATORY all=y
-WIRELESS_EXT all=y
+CFG80211_INTERNAL_REGDB all=n
+CFG80211_WEXT all=y
 WIRELESS_EXT_SYSFS all=y
 LIB80211 all=m
 LIB80211_DEBUG all=n
@@ -5946,22 +7411,38 @@ SAMPLES all=n
 #- *** FILE: security/Kconfig ***
 #-
 KEYS all=y
+TRUSTED_KEYS all=m
+ENCRYPTED_KEYS all=m
 KEYS_DEBUG_PROC_KEYS all=n
+SECURITY_DMESG_RESTRICT all=y
 SECURITY all=y
 SECURITY_NETWORK all=y
 SECURITY_NETWORK_XFRM all=y
 SECURITY_PATH all=y
-SECURITY_FILE_CAPABILITIES 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
+DEFAULT_SECURITY_SELINUX all=n
+DEFAULT_SECURITY_SMACK all=n
+DEFAULT_SECURITY_TOMOYO all=n
+DEFAULT_SECURITY_APPARMOR=n
+DEFAULT_SECURITY_DAC all=y
+DEFAULT_SECURITY all=""
+
+#-
+#- *** FILE: security/apparmor/Kconfig ***
+#-
+SECURITY_APPARMOR=y
+SECURITY_APPARMOR_BOOTPARAM_VALUE=1
+SECURITY_APPARMOR_COMPAT_24=y
 
 #-
 #- *** FILE: security/integrity/ima/Kconfig ***
 #-
-IMA x86=y ia64=y
+IMA all=n
 
 #-
 #- *** FILE: security/selinux/Kconfig ***
@@ -6004,6 +7485,7 @@ SND all=m
 #- file sound/mips/Kconfig goes here
 #- file sound/sh/Kconfig goes here
 #- file sound/usb/Kconfig goes here
+#- file sound/firewire/Kconfig goes here
 #- file sound/pcmcia/Kconfig goes here
 #- file sound/sparc/Kconfig goes here
 #- file sound/parisc/Kconfig goes here
@@ -6056,7 +7538,7 @@ SND_HRTIMER all=m
 SND_SEQ_HRTIMER_DEFAULT all=y
 SND_RTCTIMER alpha=m i386=m ia64=m x86_64=m
 SND_SEQ_RTCTIMER_DEFAULT alpha=y i386=y ia64=y x86_64=y
-SND_DYNAMIC_MINORS all=n
+SND_DYNAMIC_MINORS all=y
 SND_SUPPORT_OLD_API all=y
 SND_VERBOSE_PROCFS all=y
 SND_VERBOSE_PRINTK all=n
@@ -6083,6 +7565,14 @@ SND_PORTMAN2X4 all=m
 SND_AC97_POWER_SAVE all=y
 SND_AC97_POWER_SAVE_DEFAULT all=0
 
+#-
+#- *** FILE: sound/firewire/Kconfig ***
+#-
+SND_FIREWIRE all=y
+SND_FIREWIRE_LIB all=m
+SND_FIREWIRE_SPEAKERS all=m
+SND_ISIGHT all=m
+
 #-
 #- *** FILE: sound/isa/Kconfig ***
 #-
@@ -6094,12 +7584,12 @@ SND_ADLIB alpha=m i386=m
 SND_AD1816A alpha=m i386=m
 SND_AD1848 alpha=m i386=m
 SND_ALS100 alpha=m i386=m
+SND_AZT1605 all=m
+SND_AZT2316 all=m
 SND_AZT2320 alpha=m i386=m
 SND_CMI8330 alpha=m i386=m
 SND_CS4231 alpha=m i386=m
 SND_CS4236 alpha=m i386=m
-SND_DT019X alpha=m i386=m
-SND_ES968 alpha=m i386=m
 SND_ES1688 alpha=m i386=m
 SND_ES18XX alpha=m i386=m
 SND_SC6000 alpha=m i386=m
@@ -6108,6 +7598,7 @@ SND_GUSEXTREME alpha=m i386=m
 SND_GUSMAX alpha=m i386=m
 SND_INTERWAVE alpha=m i386=m
 SND_INTERWAVE_STB alpha=m i386=m
+SND_JAZZ16 alpha=m i386=m
 SND_OPL3SA2 alpha=m i386=m
 SND_OPTI92X_AD1848 alpha=m i386=m
 SND_OPTI92X_CS4231 alpha=m i386=m
@@ -6117,7 +7608,6 @@ SND_SB8 alpha=m i386=m
 SND_SB16 alpha=m i386=m
 SND_SBAWE alpha=m i386=m
 SND_SB16_CSP alpha=y i386=y
-SND_SGALAXY alpha=m i386=m
 SND_SSCAPE alpha=m i386=m
 SND_WAVEFRONT alpha=m i386=m
 SND_MSND_PINNACLE i386=m
@@ -6135,7 +7625,6 @@ SOUND_MSNDPIN all=n
 SOUND_OSS all=m
 SOUND_TRACEINIT all=y i386=n x86_64=n
 SOUND_DMAP all=n
-SOUND_SSCAPE all=m
 SOUND_VMIDI all=m
 SOUND_TRIX all=m x86_64=n
 SOUND_MSS all=m x86_64=n
@@ -6162,6 +7651,7 @@ SND_AD1889 all=m
 SND_ALS300 all=m
 SND_ALS4000 alpha=m i386=m ppc=m ppc64=m x86_64=m
 SND_ALI5451 all=m
+SND_ASIHPI all=m
 SND_ATIIXP all=m
 SND_ATIIXP_MODEM all=m
 SND_AU8810 all=m
@@ -6200,21 +7690,24 @@ SND_ENS1370 all=m
 SND_ENS1371 all=m
 SND_ES1938 all=m
 SND_ES1968 all=m
+SND_ES1968_INPUT all=y
+SND_ES1968_RADIO all=y
 SND_FM801 all=m
 SND_FM801_TEA575X_BOOL all=y
-SND_FM801_TEA575X all=m
+SND_TEA575X all=m
 #- file sound/pci/hda/Kconfig goes here
 SND_HDSP all=m sparc=n
 #- Don't forget to add built-in firmwares for HDSP driver
 SND_HDSPM all=m sparc=n
-SND_HIFIER all=m sparc=n
 SND_ICE1712 all=m
 SND_ICE1724 all=m
 SND_INTEL8X0 all=m sparc=n
 SND_INTEL8X0M all=m sparc=m
 SND_KORG1212 all=m
+SND_LOLA all=m
 SND_LX6464ES all=m
 SND_MAESTRO3 all=m
+SND_MAESTRO3_INPUT all=y
 SND_MIXART all=m
 SND_NM256 all=m
 SND_PCXHR all=m sparc=n
@@ -6238,15 +7731,14 @@ SND_HDA_INTEL all=m sparc=n
 SND_HDA_HWDEP all=y
 SND_HDA_RECONFIG all=y
 SND_HDA_INPUT_BEEP all=y
+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_CODEC_ANALOG all=y
 SND_HDA_CODEC_SIGMATEL all=y
 SND_HDA_CODEC_VIA all=y
-SND_HDA_CODEC_ATIHDMI all=y
-SND_HDA_CODEC_NVHDMI all=y
-SND_HDA_CODEC_INTELHDMI all=y
+SND_HDA_CODEC_HDMI all=y
 SND_HDA_CODEC_CIRRUS all=y
 SND_HDA_CODEC_CONEXANT all=y
 SND_HDA_CODEC_CA0110 all=y
@@ -6275,17 +7767,24 @@ 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
 #- file sound/soc/davinci/Kconfig goes here
+#- file sound/soc/ep93xx/Kconfig goes here
 #- file sound/soc/fsl/Kconfig goes here
 #- file sound/soc/imx/Kconfig goes here
+#- file sound/soc/jz4740/Kconfig goes here
+#- file sound/soc/nuc900/Kconfig goes here
 #- 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/pxa/Kconfig goes here
-#- file sound/soc/s3c24xx/Kconfig goes here
+#- file sound/soc/samsung/Kconfig goes here
 #- file sound/soc/s6000/Kconfig goes here
 #- file sound/soc/sh/Kconfig goes here
+#- file sound/soc/tegra/Kconfig goes here
 #- file sound/soc/txx9/Kconfig goes here
 #- file sound/soc/codecs/Kconfig goes here
 
@@ -6293,6 +7792,17 @@ SND_SOC all=m
 #- *** FILE: sound/soc/codecs/Kconfig ***
 #-
 SND_SOC_ALL_CODECS all=m
+SND_SOC_AK4641 all=m
+SND_SOC_CS4271 all=m
+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_WM8915 all=m
+SND_SOC_WM8991 all=m
+SND_SOC_LM4857 all=m
 
 #-
 #- *** FILE: sound/soc/fsl/Kconfig ***
@@ -6320,10 +7830,12 @@ SND_SPI all=y
 #-
 SND_USB all=y
 SND_USB_AUDIO all=m
+SND_USB_UA101 all=m
 SND_USB_USX2Y all=m
 SND_USB_CAIAQ all=m
 SND_USB_CAIAQ_INPUT all=y sparc64=n
 SND_USB_US122L all=m
+SND_USB_6FIRE all=m
 
 #-
 #- *** FILE: usr/Kconfig ***
@@ -6332,6 +7844,8 @@ INITRAMFS_SOURCE all=""
 RD_GZIP all=y
 RD_BZIP2 all=y
 RD_LZMA all=y
+RD_XZ all=y
+RD_LZO all=y
 INITRAMFS_COMPRESSION_NONE all=y
 INITRAMFS_COMPRESSION_GZIP all=n
 INITRAMFS_COMPRESSION_BZIP2 all=n