- rel 3; fix creds with vservers

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

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index ee9ae7b573c2dd0e56ada583a2aaf0b071bcc2ec..b74b6027914f1753034ba256d3b1b3f7686c4a1c 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -1,9 +1,16 @@
 
+#-
+#- *** FILE: arch/* - ARCH SPECIFIC OPTIONS ***
+#-
+DEBUG_STRICT_USER_COPY_CHECKS all=n
+OPTPROBES all=y
+PCI_CNB20LE_QUIRK all=y
+
 #-
 #- *** FILE: block/Kconfig ***
 #-
 BLOCK all=y
-LBDAF i386=y
+LBDAF i386=y ppc=y sparc=y sparc64=
 BLK_DEV_BSG all=y
 BLK_DEV_INTEGRITY all=y
 #- file block/Kconfig.iosched goes here
@@ -12,10 +19,9 @@ BLK_DEV_INTEGRITY all=y
 #- *** FILE: block/Kconfig.iosched ***
 #-
 IOSCHED_NOOP all=y
-IOSCHED_AS all=y
 IOSCHED_DEADLINE all=y
 IOSCHED_CFQ all=y
-DEFAULT_AS all=n
+CFQ_GROUP_IOSCHED all=y
 DEFAULT_DEADLINE all=n
 DEFAULT_CFQ all=y
 DEFAULT_NOOP all=n
@@ -33,8 +39,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
@@ -70,6 +78,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
@@ -102,6 +111,11 @@ CRYPTO_LZO all=m
 CRYPTO_ANSI_CPRNG all=m
 #- file drivers/crypto/Kconfig goes here
 
+#-
+#- *** FILE: crypto/async_tx/Kconfig ***
+#-
+ASYNC_RAID6_TEST all=m
+
 #-
 #- *** FILE: drivers/accessibility/Kconfig ***
 #-
@@ -111,17 +125,18 @@ A11Y_BRAILLE_CONSOLE=y
 #-
 #- *** FILE: drivers/acpi/Kconfig ***
 #-
-ACPI all=y
-ACPI_SLEEP i386=y x86_64=y
+ACPI ia64=y x86=y
+ACPI_SLEEP x86=y
 ACPI_PROCFS all=y
-ACPI_PROCFS_POWER i386=y ia64=y x86_64=y
+ACPI_PROCFS_POWER ia64=y x86=y
 ACPI_POWER_METER all=m
-ACPI_SYSFS_POWER i386=y ia64=y x86_64=y
+ACPI_SYSFS_POWER ia64=y x86=y
+ACPI_EC_DEBUGFS all=m
 ACPI_PROC_EVENT all=y
-ACPI_AC i386=m x86_64=m
-ACPI_BATTERY i386=m x86_64=m
+ACPI_AC x86=m
+ACPI_BATTERY x86=m
 ACPI_BUTTON all=m
-ACPI_VIDEO i386=m x86_64=m
+ACPI_VIDEO x86=m
 ACPI_FAN all=m
 ACPI_DOCK all=y
 ACPI_PROCESSOR all=m
@@ -134,10 +149,20 @@ ACPI_CUSTOM_DSDT all=n
 ACPI_BLACKLIST_YEAR all=0
 ACPI_DEBUG all=n
 ACPI_PCI_SLOT all=m
-X86_PM_TIMER i386=y x86_64=y
+X86_PM_TIMER x86=y
 ACPI_CONTAINER all=m
 ACPI_HOTPLUG_MEMORY all=m
-ACPI_SBS i386=m x86_64=m
+ACPI_SBS x86=m
+ACPI_HED 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_EINJ all=m
+ACPI_APEI_ERST_DEBUG all=m
 
 #-
 #- *** FILE: drivers/ata/Kconfig ***
@@ -147,31 +172,36 @@ 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_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
+PATA_MPC52xx ppc=m
+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_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
@@ -179,46 +209,50 @@ PATA_CS5535 i386=m
 PATA_CS5536 i386=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
+#- 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 ppc=m ppc64=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 ***
@@ -233,9 +267,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
@@ -268,7 +302,8 @@ CFAG12864B_RATE i386=20 x86_64=20
 #- *** FILE: drivers/base/Kconfig ***
 #-
 UEVENT_HELPER_PATH all="/sbin/hotplug"
-DEVTMPFS all=n
+DEVTMPFS all=y
+DEVTMPFS_MOUNT all=y
 STANDALONE all=n
 PREVENT_FIRMWARE_BUILD all=y
 FIRMWARE_IN_KERNEL all=n
@@ -294,6 +329,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
@@ -311,6 +347,13 @@ SUNVDC sparc64=m
 VIRTIO_BLK all=m
 BLK_DEV_HD all=n
 
+#-
+#- *** 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 ***
 #-
@@ -346,6 +389,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
@@ -357,6 +401,7 @@ BT_HCIBTUART all=m
 BT_HCIVHCI all=m
 BT_MRVL all=m
 BT_MRVL_SDIO all=m
+BT_ATH3K all=m
 
 #-
 #- *** FILE: drivers/char/Kconfig ***
@@ -372,7 +417,6 @@ 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
@@ -380,6 +424,7 @@ SYNCLINK all=m
 SYNCLINKMP all=m
 SYNCLINK_GT all=m
 N_HDLC all=m
+N_GSM all=m
 RISCOM8 all=m
 SPECIALIX all=m
 SX all=m
@@ -438,6 +483,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 ***
@@ -493,8 +539,10 @@ IPWIRELESS all=m
 #-
 #- *** FILE: drivers/char/tpm/Kconfig ***
 #-
-TCG_TPM all=m
-TCG_TIS all=m
+#* TCG_TPM forced to 'y' by IMA
+TCG_TPM all=m x86=y ia64=y
+#* TCG_TIS forced to 'y' by IMA
+TCG_TIS all=m x86=y ia64=y
 TCG_NSC all=m
 TCG_ATMEL all=m
 TCG_INFINEON all=m
@@ -544,9 +592,13 @@ 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
@@ -572,12 +624,15 @@ 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_PASEMI ppc64=m
 EDAC_CELL ppc64=m
+EDAC_AMD8131 powerpc=m
+EDAC_AMD8111 powerpc=m
 
 #-
 #- *** FILE: drivers/eisa/Kconfig ***
@@ -591,11 +646,13 @@ 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.
+#- The newer stack is recommended.
 FIREWIRE all=n ia64=m ppc=m ppc64=m x86_64=m
 FIREWIRE_OHCI all=m
 FIREWIRE_SBP2 all=m
 FIREWIRE_NET all=m
+#- file drivers/ieee1394/Kconfig goes here
+FIREWIRE_NOSY all=m
 
 #-
 #- *** FILE: drivers/firmware/Kconfig ***
@@ -617,22 +674,32 @@ GPIOLIB all=y
 DEBUG_GPIO all=n
 GPIO_SYSFS all=y
 #- Memory mapped GPIO expanders:
-GPIO_XILINX ppc=y
+GPIO_IT8761E all=m
+GPIO_XILINX powerpc=y
+GPIO_SCH all=m
 #- I2C GPIO expanders:
+GPIO_MAX7300 all=m
 GPIO_MAX732X all=m
 GPIO_PCA953X all=m
 GPIO_PCF857X 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_TIMBERDALE all=y
+GPIO_RDC321X all=m
 #- SPI GPIO expanders:
 GPIO_MAX7301 all=m
 GPIO_MCP23S08 all=m
 GPIO_MC33880 all=m
 #- AC97 GPIO expanders:
 GPIO_UCB1400 all=y
+#- MODULbus GPIO expanders:
+GPIO_JANZ_TTL all=m
 
 #-
 #- *** FILE: drivers/gpu/drm/Kconfig ***
@@ -641,6 +708,7 @@ 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
@@ -650,11 +718,31 @@ 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/vga/Kconfig ***
+#-
+VGA_ARB_MAX_GPUS all=16
+VGA_SWITCHEROO all=y
+
 #-
 #- *** FILE: drivers/hid/Kconfig ***
 #-
@@ -662,14 +750,46 @@ HID_SUPPORT all=y
 HID all=m
 HIDRAW all=y
 #- file drivers/hid/usbhid/Kconfig goes here
+HID_3M_PCT all=m
+HID_ACRUX_FF all=m
+HID_CANDO all=m
+HID_PRODIKEYS all=m
+HID_DRAGONRISE all=m
 DRAGONRISE_FF all=y
+HID_EGALAX all=m
+HID_ELECOM all=m
+HID_GYRATION all=m
+HID_TWINHAN all=m
 LOGITECH_FF all=y
 LOGIRUMBLEPAD2_FF all=y
+LOGIG940_FF all=y
+HID_MAGICMOUSE all=m
+HID_MOSART 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_QUANTA all=m
+HID_ROCCAT all=m
+HID_ROCCAT_KONE all=m
+HID_SAMSUNG all=m
+HID_SONY all=m
+HID_STANTUM 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 ***
@@ -700,11 +820,13 @@ 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_K10TEMP all=m
 SENSORS_AMS ppc=m
 SENSORS_AMS_PMU ppc=y
 SENSORS_AMS_I2C ppc=y
@@ -720,11 +842,14 @@ SENSORS_G760A all=m
 SENSORS_GL518SM all=m
 SENSORS_GL520SM all=m
 SENSORS_CORETEMP all=m
+SENSORS_PKGTEMP all=m
 SENSORS_IBMAEM all=m
 SENSORS_IBMPEX all=m
 SENSORS_IT87 all=m
+SENSORS_JC42 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
@@ -746,14 +871,21 @@ SENSORS_PC87427 all=m
 SENSORS_PCF8591 all=m
 SENSORS_SHT15 all=m
 SENSORS_SIS5595 all=m
+SENSORS_SMM665 all=m
 SENSORS_DME1737 all=m
+SENSORS_EMC1403 all=m
+SENSORS_EMC2103 all=m
 SENSORS_SMSC47M1 all=m
 SENSORS_SMSC47M192 all=m
 SENSORS_SMSC47B397 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
@@ -767,9 +899,12 @@ SENSORS_W83627HF all=m
 SENSORS_W83627EHF all=m
 SENSORS_WM831X all=m
 SENSORS_WM8350 all=m
+SENSORS_ULTRA45 sparc64=m
 SENSORS_HDAPS all=m
-SENSORS_LIS3_SPI ppc=m
+SENSORS_LIS3_SPI all=m
+SENSORS_LIS3_I2C all=m
 SENSORS_APPLESMC all=m
+SENSORS_MC13783_ADC all=m
 #- ACPI drivers
 SENSORS_ATK0110 all=m
 SENSORS_LIS3LV02D all=m
@@ -781,14 +916,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 ***
@@ -824,22 +959,22 @@ I2C_SCMI all=m
 I2C_HYDRA ppc=m
 I2C_POWERMAC ppc=m ppc64=m
 #- I2C system bus drivers (mostly embedded / system-on-chip)
+I2C_DESIGNWARE powerpc=m
 I2C_GPIO all=m
 I2C_MPC ppc=n
 I2C_OCORES all=m
 I2C_PASEMI ppc64=m
+I2C_PCA_PLATFORM all=m
 I2C_SIMTEC all=m sparc=n
+I2C_XILINX all=m
 #- External I2C/SMBus adapter drivers
 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
@@ -847,10 +982,9 @@ 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_PCA954x all=m
 
 #-
 #- *** FILE: drivers/ide/Kconfig ***
@@ -929,12 +1063,12 @@ 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
@@ -965,9 +1099,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
@@ -986,6 +1122,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 ***
 #-
@@ -1007,6 +1148,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 ***
 #-
@@ -1030,7 +1176,8 @@ INFINIBAND_SRP all=m sparc=
 #-
 INPUT all=y
 INPUT_FF_MEMLESS all=m
-INPUT_POLLDEV all=m sparc=n
+INPUT_POLLDEV all=m
+INPUT_SPARSEKMAP all=m
 #- Userland interfaces
 INPUT_MOUSEDEV all=y
 INPUT_MOUSEDEV_PSAUX all=y
@@ -1103,22 +1250,28 @@ JOYSTICK_IFORCE_232 all=y
 INPUT_KEYBOARD all=y
 KEYBOARD_ADP5588 all=m 
 KEYBOARD_ATKBD all=y sparc=m sparc64=m
-QT2160 all=m
+KEYBOARD_QT2160 all=m
 KEYBOARD_LKKBD all=m
 KEYBOARD_GPIO all=m
+KEYBOARD_TCA6416 all=m
 KEYBOARD_MATRIX all=m
 KEYBOARD_LM8323 all=m
 KEYBOARD_MAX7359 all=m
+KEYBOARD_MCS all=m
 KEYBOARD_NEWTON all=m
 KEYBOARD_OPENCORES all=m
 KEYBOARD_STOWAWAY all=m
 KEYBOARD_SUNKBD all=m sparc=y sparc64=y
+KEYBOARD_TWL4030 powerpc=m
 KEYBOARD_XTKBD all=m
 
 #-
 #- *** FILE: drivers/input/misc/Kconfig ***
 #-
 INPUT_MISC all=y
+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
@@ -1130,12 +1283,17 @@ INPUT_KEYSPAN_REMOTE all=m sparc=n
 INPUT_POWERMATE all=m sparc=n
 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
 
 #-
 #- *** FILE: drivers/input/mouse/Kconfig ***
@@ -1173,6 +1331,7 @@ 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
 
 #-
 #- *** FILE: drivers/input/tablet/Kconfig ***
@@ -1190,8 +1349,13 @@ 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_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
@@ -1203,6 +1367,7 @@ TOUCHSCREEN_INEXIO all=m
 TOUCHSCREEN_MK712 all=m sparc=n
 TOUCHSCREEN_HTCPEN all=m
 TOUCHSCREEN_PENMOUNT all=m
+TOUCHSCREEN_QT602240 all=m
 TOUCHSCREEN_TOUCHRIGHT all=m
 TOUCHSCREEN_TOUCHWIN all=m
 TOUCHSCREEN_UCB1400 all=m sparc=n
@@ -1211,6 +1376,7 @@ 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
@@ -1227,18 +1393,20 @@ TOUCHSCREEN_TOUCHIT213 all=m
 TOUCHSCREEN_TSC2007 all=m
 TOUCHSCREEN_W90X900 all=m
 TOUCHSCREEN_PCAP 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 ***
@@ -1260,6 +1428,7 @@ 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
@@ -1336,7 +1505,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 ***
@@ -1369,12 +1537,14 @@ NEW_LEDS all=y
 LEDS_CLASS all=m ppc=y ppc64=y
 #- LED drivers
 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_GPIO all=m
 LEDS_GPIO_PLATFORM all=y
-LEDS_GPIO_OF ppc=y
+LEDS_GPIO_OF powerpc=y sparc=y
 LEDS_LP3944 all=m
 LEDS_CLEVO_MAIL all=m
 LEDS_PCA955X all=m
@@ -1382,9 +1552,14 @@ 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
@@ -1439,7 +1614,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
@@ -1455,6 +1629,28 @@ DM_MULTIPATH_ST all=m
 DM_DELAY all=m
 DM_UEVENT all=y
 
+#-
+#- *** FILE: drivers/media/IR/Kconfig ***
+#-
+IR_CORE all=m
+VIDEO_IR all=m sparc=
+#- file drivers/media/IR/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_LIRC_CODEC all=m
+IR_IMON all=m
+IR_MCEUSB all=m
+IR_ENE all=m
+IR_STREAMZAP all=m
+
+#-
+#- *** FILE: drivers/media/IR/keymaps/Kconfig ***
+#-
+RC_MAP all=m
+
 #-
 #- *** FILE: drivers/media/Kconfig ***
 #-
@@ -1467,6 +1663,7 @@ VIDEO_V4L1_COMPAT all=y
 DVB_CORE all=m
 #- Multimedia drivers
 #- file drivers/media/common/Kconfig goes here
+#- file drivers/media/IR/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
@@ -1511,6 +1708,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
 
@@ -1564,6 +1765,8 @@ 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
 
 #-
 #- *** FILE: drivers/media/dvb/firewire/Kconfig ***
@@ -1630,6 +1833,18 @@ 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 ***
 #-
@@ -1680,6 +1895,7 @@ 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
@@ -1689,15 +1905,19 @@ RADIO_ZOLTRIX alpha=m i386=m
 I2C_SI4713 all=m
 RADIO_SI4713 all=m
 USB_DSBR all=m
-RADIO_SI470X all=n
+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
 
 #-
 #- *** FILE: drivers/media/radio/si470x/Kconfig ***
 #-
 USB_SI470X all=m
+I2C_SI470X all=m
 
 #-
 #- *** FILE: drivers/media/video/Kconfig ***
@@ -1705,7 +1925,6 @@ USB_SI470X all=m
 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=
 VIDEO_CAPTURE_DRIVERS all=y
@@ -1748,6 +1967,8 @@ VIDEO_ADV7175 all=m
 VIDEO_UPD64031A all=m
 VIDEO_UPD64083 all=m
 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
@@ -1777,10 +1998,13 @@ SOC_CAMERA 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_OV772X all=m
+SOC_CAMERA_OV9640 all=m
 VIDEO_SH_MOBILE_CEU all=m
 V4L_USB_DRIVERS all=y sparc=n
 #- file drivers/media/video/uvc/Kconfig goes here
@@ -1788,21 +2012,19 @@ 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 ***
@@ -1824,6 +2046,7 @@ 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 ***
@@ -1870,7 +2093,9 @@ 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
@@ -1878,10 +2103,12 @@ USB_GSPCA_MARS all=m
 USB_GSPCA_MR97310A 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
@@ -1890,9 +2117,12 @@ 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
@@ -1957,6 +2187,11 @@ VIDEO_SAA7164 all=m
 #-
 USB_SN9C102 all=m
 
+#-
+#- *** FILE: drivers/media/video/tlg2300/Kconfig ***
+#-
+VIDEO_TLG2300 all=m
+
 #-
 #- *** FILE: drivers/media/video/usbvideo/Kconfig ***
 #-
@@ -1964,7 +2199,6 @@ VIDEO_USBVIDEO all=m
 USB_VICAM all=m
 USB_IBMCAM all=m
 USB_KONICAWC all=m
-USB_QUICKCAM_MESSENGER all=m
 
 #-
 #- *** FILE: drivers/media/video/usbvision/Kconfig ***
@@ -1977,11 +2211,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 ***
 #-
@@ -2045,28 +2274,41 @@ 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
 TPS65010 all=m
+TPS6507X all=m
 TWL4030_CORE powerpc=y
-PMIC_DA903X ppc=y
+PMIC_DA903X powerpc=y
 MFD_WM8400 all=m
-MFD_WM831X all=m
-MFD_WM8350_I2C all=m
+MFD_WM831X 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
+ABX500_CORE all=y
+AB3100_CORE all=y
 AB3100_OTP all=m
 EZX_PCAP all=y
+AB8500_CORE all=y
+MFD_TIMBERDALE all=m
+LPC_SCH all=m
+MFD_RDC321X all=m
+MFD_JANZ_CMODIO all=m
+MFD_TPS6586X all=m
 
 #-
 #- *** FILE: drivers/misc/Kconfig ***
 #-
 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
 SGI_IOC4 all=m ppc=n ppc64=n
@@ -2075,14 +2317,23 @@ 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
 ISL29003 all=m
+SENSORS_TSL2550 all=m
+SENSORS_BH1780 all=m
+HMC6352 all=m
+DS1682 all=m
+TI_DAC7512 all=m
+VMWARE_BALLOON all=m
+BMP085 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/c2port/Kconfig ***
@@ -2105,6 +2356,13 @@ 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/mmc/Kconfig ***
 #-
@@ -2134,8 +2392,8 @@ 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_SDHCI_OF ppc=m
+MMC_RICOH_MMC all=y
+MMC_SDHCI_OF powerpc=m
 MMC_SDHCI_PLTFM all=m
 MMC_WBSD all=m
 MMC_TIFM_SD all=m
@@ -2169,6 +2427,7 @@ NFTL_RW all=y
 INFTL all=m
 RFD_FTL all=m
 SSFDC all=m
+SM_FTL all=m
 MTD_OOPS all=m
 #- file drivers/mtd/chips/Kconfig goes here
 #- file drivers/mtd/maps/Kconfig goes here
@@ -2266,6 +2525,8 @@ 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
@@ -2273,11 +2534,14 @@ MTD_PLATRAM 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_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
@@ -2306,7 +2570,7 @@ MTD_ONENAND_SIM all=m
 MTD_UBI all=m sparc=n
 MTD_UBI_WL_THRESHOLD all=4096
 MTD_UBI_BEB_RESERVE all=1
-MTD_UBI_GLUEBI all=n ppc=y ppc64=y
+MTD_UBI_GLUEBI all=n powerpc=m
 #- file drivers/mtd/ubi/Kconfig.debug goes here
 
 #-
@@ -2323,6 +2587,7 @@ IFB all=m
 DUMMY all=m
 BONDING all=m
 MACVLAN all=m
+MACVTAP all=m
 EQUALIZER all=m
 TUN all=m
 VETH all=m
@@ -2393,10 +2658,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
@@ -2431,7 +2696,9 @@ DE620 all=m
 FEC_MPC52xx ppc=m
 FEC_MPC52xx_MDIO ppc=y
 ATL2 all=m
+XILINX_EMACLITE powerpc=m
 #- file drivers/net/fs_enet/Kconfig goes here
+#- file drivers/net/octeon/Kconfig goes here
 NETDEV_1000 all=y
 ACENIC all=m sparc=n
 ACENIC_OMIT_TIGON_I all=n
@@ -2456,12 +2723,11 @@ SKY2 all=m sparc=n
 SKY2_DEBUG all=n
 VIA_VELOCITY all=m
 TIGON3 all=m
-BNX2 all=m sparc=n
+BNX2 all=m
 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
@@ -2474,10 +2740,13 @@ 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
@@ -2488,9 +2757,10 @@ NETXEN_NIC all=m sparc=n
 NIU all=m
 PASEMI_MAC ppc64=m
 MLX4_EN all=m
-MLX4_CORE all=m sparc=n
+MLX4_CORE all=m
 TEHUTI all=m
 BNX2X all=m
+QLCNIC all=m
 QLGE all=m
 #- file drivers/net/sfc/Kconfig goes here
 #- file drivers/net/benet/Kconfig goes here
@@ -2503,6 +2773,7 @@ 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
 FDDI all=y
 DEFXX all=m
@@ -2568,12 +2839,23 @@ 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_DEV all=m
 CAN_CALC_BITTIMING all=y
+CAN_MCP251X all=m
+CAN_JANZ_ICAN3 all=m
+#- file drivers/net/can/mscan/Kconfig goes here
 #- file drivers/net/can/sja1000/Kconfig goes here
 #- file drivers/net/can/usb/Kconfig goes here
 CAN_DEBUG_DEVICES all=n
@@ -2584,13 +2866,16 @@ CAN_DEBUG_DEVICES all=n
 CAN_SJA1000 all=m
 CAN_SJA1000_ISA all=m
 CAN_SJA1000_PLATFORM all=m
+CAN_SJA1000_OF_PLATFORM powerpc=m
 CAN_EMS_PCI all=m
 CAN_KVASER_PCI all=m
+CAN_PLX_PCI all=m
 
 #-
 #- *** FILE: drivers/net/can/usb/Kconfig ***
 #-
 CAN_EMS_USB all=m
+CAN_ESD_USB2 all=m
 
 #-
 #- *** FILE: drivers/net/hamradio/Kconfig ***
@@ -2684,6 +2969,7 @@ 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
@@ -2740,6 +3026,7 @@ USB_NET_AX8817X all=m
 USB_NET_CDCETHER all=m
 USB_NET_CDC_EEM 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
@@ -2757,6 +3044,8 @@ USB_NET_ZAURUS 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
 
 #-
 #- *** FILE: drivers/net/wan/Kconfig ***
@@ -2805,27 +3094,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
@@ -2837,28 +3115,29 @@ 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/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/wl12xx/Kconfig goes here
-#- file drivers/net/wireless/iwmc3200wifi/Kconfig goes here
+#- file drivers/net/wireless/zd1211rw/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
@@ -2878,7 +3157,9 @@ ATH5K_DEBUG all=n
 #- *** FILE: drivers/net/wireless/ath/ath9k/Kconfig ***
 #-
 ATH9K all=m
-ATH9K_DEBUG all=n
+ATH9K_DEBUGFS all=n
+ATH9K_HTC all=m
+ATH9K_HTC_DEBUGFS all=y
 
 #-
 #- *** FILE: drivers/net/wireless/b43/Kconfig ***
@@ -2926,25 +3207,36 @@ LIBIPW_DEBUG all=n
 #- *** FILE: drivers/net/wireless/iwlwifi/Kconfig ***
 #-
 IWLWIFI all=m
-IWLWIFI_LEDS all=y
-IWLWIFI_SPECTRUM_MEASUREMENT all=y
 IWLWIFI_DEBUG all=y
+IWLWIFI_DEVICE_TRACING all=n
 IWLAGN all=m
 IWL4965 all=y
 IWL5000 all=y
 IWL3945 all=m
-IWL3945_SPECTRUM_MEASUREMENT all=y
 
 #-
 #- *** 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/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
@@ -2953,6 +3245,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 ***
@@ -2969,12 +3262,24 @@ RT2X00 all=m
 RT2400PCI all=m
 RT2500PCI all=m
 RT61PCI all=m
+RT2800PCI all=m
+RT2800PCI_RT30XX all=y
+RT2800PCI_RT35XX all=y
 RT2500USB all=m
 RT73USB all=m
 RT2800USB all=m
+RT2800USB_RT30XX all=y
+RT2800USB_RT35XX all=y
+RT2800USB_UNKNOWN all=y
 #- rt2x00 leds support disabled due to modularized LEDS_CLASS and built-in rt2x00
 RT2X00_DEBUG all=n
 
+#-
+#- *** FILE: drivers/net/wireless/rtl818x/Kconfig ***
+#-
+RTL8180 all=m
+RTL8187 all=m
+
 #-
 #- *** FILE: drivers/net/wireless/wl12xx/Kconfig ***
 #-
@@ -2983,6 +3288,8 @@ WL1251 all=m
 WL1251_SPI all=m
 WL1251_SDIO all=m
 WL1271 all=m
+WL1271_SPI all=m
+WL1271_SDIO all=m
 
 #-
 #- *** FILE: drivers/net/wireless/zd1211rw/Kconfig ***
@@ -3019,7 +3326,6 @@ 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
@@ -3049,6 +3355,7 @@ PCIEPORTBUS all=y
 HOTPLUG_PCI_PCIE all=m
 #- file drivers/pci/pcie/aer/Kconfig goes here
 PCIEASPM all=n
+PCIEASPM_DEBUG all=n
 
 #-
 #- *** FILE: drivers/pci/pcie/aer/Kconfig ***
@@ -3066,10 +3373,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
@@ -3082,15 +3387,18 @@ 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
 ASUS_LAPTOP i386=m x86_64=m
+DELL_LAPTOP all=m
 DELL_WMI all=m
 FUJITSU_LAPTOP all=m
 FUJITSU_LAPTOP_DEBUG all=n
@@ -3101,7 +3409,9 @@ 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_ACPI 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
@@ -3109,10 +3419,18 @@ THINKPAD_ACPI_VIDEO all=y
 THINKPAD_ACPI_HOTKEY_POLL all=y
 INTEL_MENLOW all=m
 EEEPC_LAPTOP 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
 
 #-
 #- *** FILE: drivers/pnp/Kconfig ***
@@ -3150,6 +3468,7 @@ PDA_POWER all=m
 APM_POWER ppc=m
 WM831X_POWER all=m
 WM8350_POWER all=m
+TEST_POWER all=m
 BATTERY_DS2760 all=m
 BATTERY_DS2782 all=m
 BATTERY_PMU ppc=m
@@ -3157,27 +3476,40 @@ BATTERY_BQ27x00 all=m
 BATTERY_DA9030 all=m
 BATTERY_MAX17040 all=m
 CHARGER_PCF50633 all=m
+BATTERY_INTEL_MID all=m
 
 #-
 #- *** FILE: drivers/pps/Kconfig ***
 #-
 PPS all=m
 PPS_DEBUG all=n
+#- file drivers/pps/clients/Kconfig goes here
+
+#-
+#- *** FILE: drivers/pps/clients/Kconfig ***
+#-
+#- PPS clients support
+PPS_CLIENT_KTIMER all=m
+PPS_CLIENT_LDISC all=m
 
 #-
 #- *** 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_TWL4030 ppc=y
+REGULATOR_MAX8649 all=m
+REGULATOR_MAX8660 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
@@ -3186,6 +3518,10 @@ REGULATOR_MC13783 all=m
 REGULATOR_AB3100 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
 
 #-
 #- *** FILE: drivers/rtc/Kconfig ***
@@ -3205,14 +3541,17 @@ 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
@@ -3233,19 +3572,25 @@ RTC_DRV_DS1286 all=m
 RTC_DRV_DS1511 all=m
 RTC_DRV_DS1553 all=m
 RTC_DRV_DS1742 all=m
+RTC_DRV_EFI ia64=m
 RTC_DRV_STK17TA8 all=m
 RTC_DRV_M48T86 all=m
 RTC_DRV_M48T35 all=m
-RTC_DRV_M48T59 all=m
-RTC_DRV_BQ4802 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 ppc=y
+RTC_DRV_GENERIC powerpc=y
+RTC_DRV_PS3 ppc64=m
 RTC_DRV_PCAP all=m
+RTC_DRV_MC13783 all=m
 
 #-
 #- *** FILE: drivers/sbus/char/Kconfig ***
@@ -3295,7 +3640,9 @@ ISCSI_TCP all=m
 #- file drivers/scsi/bnx2i/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
@@ -3317,6 +3664,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
@@ -3388,6 +3736,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
@@ -3525,7 +3874,11 @@ SERIAL_8250_RSA all=y
 SERIAL_8250_MCA i386=m
 #- Non-8250 serial port support
 SERIAL_MAX3100 all=m
-SERIAL_UARTLITE ppc=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
@@ -3549,6 +3902,12 @@ 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
 
 #-
 #- *** FILE: drivers/sfi/Kconfig ***
@@ -3572,6 +3931,10 @@ SPI_BUTTERFLY all=m
 SPI_GPIO all=m
 SPI_LM70_LLP all=m
 SPI_MPC52xx_PSC ppc=m
+SPI_XILINX all=m
+SPI_XILINX_PLTFM all=m
+SPI_DESIGNWARE all=y
+SPI_DW_PCI all=m
 #- SPI Protocol Masters
 SPI_SPIDEV all=m sparc=n
 SPI_TLE62X0 all=m
@@ -3581,6 +3944,7 @@ SPI_TLE62X0 all=m
 #-
 SSB all=m
 SSB_PCMCIAHOST all=y
+SSB_SDIOHOST sparc=y
 SSB_DEBUG all=n
 
 #-
@@ -3592,59 +3956,63 @@ STAGING_EXCLUDE_BUILD all=n
 #- 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/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/comedi/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/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/memrar/Kconfig goes here
 #- file drivers/staging/iio/Kconfig goes here
-
-#-
-#- *** FILE: drivers/staging/altpciechdma/Kconfig ***
-#-
-ALTERA_PCIE_CHDMA all=m
-
-#-
-#- *** FILE: drivers/staging/android/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
+#- file drivers/staging/zram/Kconfig goes here
+#- file drivers/staging/wlags49_h2/Kconfig goes here
+#- file drivers/staging/wlags49_h25/Kconfig goes here
+#- file drivers/staging/batman-adv/Kconfig goes here
+#- file drivers/staging/samsung-laptop/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/ti-st/Kconfig goes here
+#- file drivers/staging/adis16255/Kconfig goes here
+#- file drivers/staging/xgifb/Kconfig goes here
+#- file drivers/staging/mrst-touchscreen/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/adis16255/Kconfig ***
+#-
+ADIS16255 all=m
 
 #-
 #- *** FILE: drivers/staging/asus_oled/Kconfig ***
@@ -3652,18 +4020,143 @@ ANDROID_LOW_MEMORY_KILLER all=n
 ASUS_OLED all=m
 
 #-
-#- *** FILE: drivers/staging/b3dfg/Kconfig ***
+#- *** FILE: drivers/staging/batman-adv/Kconfig ***
 #-
-B3DFG all=m
+BATMAN_ADV all=m
+BATMAN_ADV_DEBUG 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/crystalhd/Kconfig ***
+#-
+CRYSTALHD all=m
 
 #-
 #- *** FILE: drivers/staging/cx25821/Kconfig ***
@@ -3671,18 +4164,28 @@ COMEDI_USB_DRIVERS all=m
 VIDEO_CX25821 all=m
 VIDEO_CX25821_ALSA all=m
 
+#-
+#- *** FILE: drivers/staging/cxt1e1/Kconfig ***
+#-
+CXT1E1 all=m
+SBE_PMCC4_NCOMM all=y
+
 #-
 #- *** FILE: drivers/staging/dream/Kconfig ***
 #-
-#- file drivers/staging/dream/smd/Kconfig goes here
 #- file drivers/staging/dream/camera/Kconfig goes here
 INPUT_GPIO all=m
 
 #-
-#- *** FILE: drivers/staging/dst/Kconfig ***
+#- *** FILE: drivers/staging/dt3155v4l/Kconfig ***
 #-
-DST all=m
-DST_DEBUG all=n
+VIDEO_DT3155 all=m
+DT3155_CCIR all=y
+
+#-
+#- *** FILE: drivers/staging/easycap/Kconfig ***
+#-
+EASYCAP all=m
 
 #-
 #- *** FILE: drivers/staging/echo/Kconfig ***
@@ -3705,8 +4208,7 @@ TRANZPORT all=m
 #-
 VIDEO_GO7007 all=m
 VIDEO_GO7007_USB all=m
-#* broken
-VIDEO_GO7007_USB_S2250_BOARD all=n
+VIDEO_GO7007_USB_S2250_BOARD all=m
 VIDEO_GO7007_OV7640 all=m
 VIDEO_GO7007_SAA7113 all=m
 VIDEO_GO7007_SAA7115 all=m
@@ -3722,36 +4224,73 @@ HYPERV all=m
 HYPERV_STORAGE all=m
 HYPERV_BLOCK all=m
 HYPERV_NET all=m
+HYPERV_UTILS all=m
 
 #-
 #- *** FILE: drivers/staging/iio/Kconfig ***
 #-
 IIO all=m
-IIO_RING_BUFFER all=n
-IIO_TRIGGER all=n
+IIO_RING_BUFFER all=y
+IIO_SW_RING all=m
+IIO_TRIGGER all=y
 #- file drivers/staging/iio/accel/Kconfig goes here
 #- file drivers/staging/iio/adc/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/trigger/Kconfig goes here
 
 #-
 #- *** FILE: drivers/staging/iio/accel/Kconfig ***
 #-
 #- Accelerometers
+ADIS16209 all=m
+ADIS16220 all=m
+ADIS16240 all=m
 KXSD9 all=m
 LIS3L02DQ all=m
+SCA3000 all=m
 
 #-
 #- *** FILE: drivers/staging/iio/adc/Kconfig ***
 #-
 #- Analog to digital convertors
 MAX1363 all=m
+MAX1363_RING_BUFFER all=y
+
+#-
+#- *** FILE: drivers/staging/iio/gyro/Kconfig ***
+#-
+#- Digital gyroscope sensors
+ADIS16260 all=m
+
+#-
+#- *** FILE: drivers/staging/iio/imu/Kconfig ***
+#-
+#- Inertial measurement units
+ADIS16300 all=m
+ADIS16350 all=m
+ADIS16400 all=m
 
 #-
 #- *** FILE: drivers/staging/iio/light/Kconfig ***
 #-
 #- Light sensors
-TSL2561 all=m
+SENSORS_TSL2563 all=m
+
+#-
+#- *** FILE: drivers/staging/iio/magnetometer/Kconfig ***
+#-
+#- Magnetometer sensors
+SENSORS_HMC5843 all=m
+
+#-
+#- *** FILE: drivers/staging/iio/trigger/Kconfig ***
+#-
+#- Triggers - standalone
+IIO_PERIODIC_RTC_TRIGGER all=m
+IIO_GPIO_TRIGGER all=m
 
 #-
 #- *** FILE: drivers/staging/line6/Kconfig ***
@@ -3759,19 +4298,36 @@ TSL2561 all=m
 LINE6_USB all=m
 
 #-
-#- *** FILE: drivers/staging/mimio/Kconfig ***
+#- *** FILE: drivers/staging/lirc/Kconfig ***
 #-
-INPUT_MIMIO all=m
+LIRC_STAGING all=y
+LIRC_BT829 all=m
+LIRC_I2C all=m
+LIRC_IGORPLUGUSB all=m
+LIRC_IMON all=m
+LIRC_IT87 all=m
+LIRC_ITE8709 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/otus/Kconfig ***
+#- *** FILE: drivers/staging/memrar/Kconfig ***
 #-
-OTUS all=m
+MRST_RAR_HANDLER all=m
 
 #-
-#- *** FILE: drivers/staging/p9auth/Kconfig ***
+#- *** FILE: drivers/staging/mrst-touchscreen/Kconfig ***
 #-
-PLAN9AUTH all=m
+TOUCHSCREEN_INTEL_MID all=m
+
+#-
+#- *** FILE: drivers/staging/otus/Kconfig ***
+#-
+OTUS all=m
 
 #-
 #- *** FILE: drivers/staging/panel/Kconfig ***
@@ -3786,11 +4342,6 @@ PANEL_CHANGE_MESSAGE all=n
 #-
 IDE_PHISON all=m
 
-#-
-#- *** FILE: drivers/staging/poch/Kconfig ***
-#-
-POCH all=m
-
 #-
 #- *** FILE: drivers/staging/pohmelfs/Kconfig ***
 #-
@@ -3804,9 +4355,9 @@ 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 ***
@@ -3818,15 +4369,10 @@ RT2860 all=m
 #-
 RT2870 all=m
 
-#-
-#- *** FILE: drivers/staging/rt3090/Kconfig ***
-#-
-RT3090 all=m
-
 #-
 #- *** FILE: drivers/staging/rtl8187se/Kconfig ***
 #-
-RTL8187SE all=m
+R8187SE all=m
 
 #-
 #- *** FILE: drivers/staging/rtl8192e/Kconfig ***
@@ -3839,9 +4385,14 @@ RTL8192E all=m
 RTL8192SU all=m
 
 #-
-#- *** FILE: drivers/staging/sep/Kconfig ***
+#- *** FILE: drivers/staging/rtl8192u/Kconfig ***
 #-
-DX_SEP all=m
+RTL8192U all=m
+
+#-
+#- *** FILE: drivers/staging/samsung-laptop/Kconfig ***
+#-
+SAMSUNG_LAPTOP all=m
 
 #-
 #- *** FILE: drivers/staging/serqt_usb2/Kconfig ***
@@ -3853,6 +4404,37 @@ USB_SERIAL_QUATECH2 all=m
 #-
 SLICOSS all=m
 
+#-
+#- *** FILE: drivers/staging/sm7xx/Kconfig ***
+#-
+FB_SM7XX all=m
+
+#-
+#- *** FILE: drivers/staging/solo6x10/Kconfig ***
+#-
+SOLO6X10 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/ti-st/Kconfig ***
+#-
+TI_ST all=m
+ST_BT all=m
+
+#-
+#- *** FILE: drivers/staging/tm6000/Kconfig ***
+#-
+VIDEO_TM6000 all=m
+VIDEO_TM6000_ALSA all=m
+VIDEO_TM6000_DVB all=y
+
 #-
 #- *** FILE: drivers/staging/udlfb/Kconfig ***
 #-
@@ -3864,6 +4446,7 @@ FB_UDL all=m
 USB_IP_COMMON all=m
 USB_IP_VHCI_HCD all=m
 USB_IP_HOST all=m
+USB_IP_DEBUG_ENABLE all=n
 
 #-
 #- *** FILE: drivers/staging/vme/Kconfig ***
@@ -3871,6 +4454,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 ***
@@ -3900,11 +4490,32 @@ 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/zram/Kconfig ***
+#-
+ZRAM all=m
+ZRAM_STATS all=y
+
 #-
 #- *** FILE: drivers/telephony/Kconfig ***
 #-
@@ -3924,10 +4535,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 ***
@@ -4019,12 +4630,26 @@ USB_ETH all=m
 USB_ETH_RNDIS all=y
 USB_ETH_EEM all=y
 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 ***
@@ -4079,7 +4704,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
@@ -4092,7 +4716,6 @@ USB_TRANCEVIBRATOR all=m
 USB_IOWARRIOR all=m
 USB_TEST all=m
 USB_ISIGHTFW all=m
-USB_VST all=m
 
 #-
 #- *** FILE: drivers/usb/misc/sisusbvga/Kconfig ***
@@ -4113,6 +4736,7 @@ USB_MUSB_HDRC all=n
 #- DaVinci 35x and 644x USB support
 #- OMAP 243x high speed USB support
 #- OMAP 343x high speed USB support
+#- OMAP 44xx high speed USB support
 #- Blackfin high speed USB Support
 
 #-
@@ -4166,11 +4790,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
@@ -4185,6 +4811,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
 
 #-
@@ -4218,10 +4847,16 @@ USB_WUSB_CBAF_DEBUG all=n
 #- *** FILE: drivers/uwb/Kconfig ***
 #-
 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 ***
 #-
@@ -4317,6 +4952,7 @@ 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_NEOMAGIC all=m
 FB_KYRO all=m
 FB_3DFX all=m sparc=n
@@ -4344,6 +4980,7 @@ FB_MB862XX all=m
 FB_MB862XX_PCI_GDC 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
@@ -4354,11 +4991,13 @@ 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
 BACKLIGHT_CLASS_DEVICE all=y
 BACKLIGHT_GENERIC all=m
 BACKLIGHT_PROGEAR i386=m x86_64=m
@@ -4367,6 +5006,8 @@ BACKLIGHT_DA903X all=m
 BACKLIGHT_MBP_NVIDIA all=m
 BACKLIGHT_SAHARA all=m
 BACKLIGHT_WM831X all=m
+BACKLIGHT_ADP8860 all=m
+BACKLIGHT_PCF50633 all=m
 
 #-
 #- *** FILE: drivers/video/console/Kconfig ***
@@ -4458,10 +5099,13 @@ WATCHDOG_NOWAYOUT all=n
 SOFT_WATCHDOG all=m
 WM831X_WATCHDOG all=m
 WM8350_WATCHDOG all=m
+TWL4030_WATCHDOG powerpc=m
 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
+GEODE_WDT all=m
 SC520_WDT i386=m x86_64=m
 SBC_FITPC2_WATCHDOG all=m
 EUROTECH_WDT i386=m x86_64=m
@@ -4474,6 +5118,7 @@ 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
@@ -4508,7 +5153,7 @@ USBPCWATCHDOG all=m
 #- *** FILE: fs/9p/Kconfig ***
 #-
 9P_FS all=m
-9P_FSCACHE all=n
+9P_FSCACHE all=y
 
 #-
 #- *** FILE: fs/Kconfig ***
@@ -4545,12 +5190,13 @@ GENERIC_ACL all=y
 #- file fs/sysfs/Kconfig goes here
 TMPFS all=y
 TMPFS_POSIX_ACL all=y
-HUGETLBFS all=y alpha= sparc=
+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
@@ -4558,6 +5204,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
@@ -4569,6 +5216,7 @@ MISC_FILESYSTEMS all=y
 #- file fs/sysv/Kconfig goes here
 #- file fs/ufs/Kconfig goes here
 #- file fs/exofs/Kconfig goes here
+#- file fs/aufs/Kconfig goes here
 NETWORK_FILESYSTEMS all=y
 #- file fs/nfs/Kconfig goes here
 #- file fs/nfsd/Kconfig goes here
@@ -4579,6 +5227,7 @@ 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
@@ -4650,6 +5299,12 @@ CACHEFILES all=m
 CACHEFILES_DEBUG all=n
 CACHEFILES_HISTOGRAM all=n
 
+#-
+#- *** FILE: fs/ceph/Kconfig ***
+#-
+CEPH_FS all=m
+CEPH_FS_PRETTYDEBUG all=n
+
 #-
 #- *** FILE: fs/cifs/Kconfig ***
 #-
@@ -4661,6 +5316,7 @@ CIFS_XATTR all=y
 CIFS_POSIX all=y
 CIFS_DEBUG2 all=n
 CIFS_DFS_UPCALL all=n
+CIFS_FSCACHE all=y
 CIFS_EXPERIMENTAL all=y
 
 #-
@@ -4825,6 +5481,11 @@ JFS_SECURITY all=y
 JFS_DEBUG all=n
 JFS_STATISTICS all=y
 
+#-
+#- *** FILE: fs/logfs/Kconfig ***
+#-
+LOGFS all=m
+
 #-
 #- *** FILE: fs/minix/Kconfig ***
 #-
@@ -4852,6 +5513,7 @@ NFS_V3_ACL all=y
 NFS_V4 all=y
 NFS_V4_1 all=n
 NFS_FSCACHE all=y
+NFS_USE_LEGACY_DNS all=n
 
 #-
 #- *** FILE: fs/nfsd/Kconfig ***
@@ -4919,7 +5581,6 @@ DNOTIFY all=y
 #-
 #- *** FILE: fs/notify/inotify/Kconfig ***
 #-
-INOTIFY all=y
 INOTIFY_USER all=y
 
 #-
@@ -4938,7 +5599,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 ***
@@ -4992,6 +5652,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
@@ -5010,6 +5671,7 @@ REISERFS_FS_SECURITY all=y
 #- *** FILE: fs/romfs/Kconfig ***
 #-
 ROMFS_FS all=y
+ROMFS_BACKED_BY_BLOCK all=y
 
 #-
 #- *** FILE: fs/smbfs/Kconfig ***
@@ -5018,6 +5680,12 @@ SMB_FS all=m
 SMB_NLS_DEFAULT all=y
 SMB_NLS_REMOTE all="iso8859-2"
 
+#-
+#- *** FILE: fs/squashfs/Kconfig ***
+#-
+SQUASHFS_XATTR all=y
+SQUASHFS_LZO all=y
+
 #-
 #- *** FILE: fs/sysfs/Kconfig ***
 #-
@@ -5067,6 +5735,7 @@ 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
@@ -5074,6 +5743,7 @@ HAVE_KERNEL_LZMA all=y
 KERNEL_GZIP all=n
 KERNEL_BZIP2 all=n
 KERNEL_LZMA all=y
+KERNEL_LZO all=n
 SWAP all=y
 SYSVIPC all=y
 SYSVIPC_SYSCTL all=y
@@ -5090,17 +5760,13 @@ 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_NS all=n
 CGROUP_FREEZER all=y
 CGROUP_DEVICE all=y
 CPUSETS all=y
@@ -5109,6 +5775,11 @@ CGROUP_CPUACCT all=y
 RESOURCE_COUNTERS all=y
 CGROUP_MEM_RES_CTLR all=y
 CGROUP_MEM_RES_CTLR_SWAP 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
 SYSFS_DEPRECATED_V2 all=n
 RELAY all=y
 NAMESPACES all=y
@@ -5140,7 +5811,6 @@ TIMERFD all=y
 EVENTFD all=y
 SHMEM all=y
 PERF_EVENTS all=y
-EVENT_PROFILE all=y
 PERF_COUNTERS all=y
 DEBUG_PERF_USE_VMALLOC all=n
 VM_EVENT_COUNTERS all=y
@@ -5150,7 +5820,6 @@ 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
@@ -5162,15 +5831,16 @@ 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 ***
 #-
-HZ_100 all=n alpha= sparc=
-HZ_250 all=n alpha= sparc=
-HZ_300 all=y alpha= sparc=
-HZ_1000 all=n alpha= sparc=
-HZ all=300 alpha=1024 sparc=100
+HZ_100 all=n alpha=
+HZ_250 all=n alpha=
+HZ_300 all=y alpha=
+HZ_1000 all=n alpha=
+HZ all=300 alpha=1024
 
 #-
 #- *** FILE: kernel/Kconfig.preempt ***
@@ -5195,6 +5865,9 @@ SUSPEND all=y
 SUSPEND_FREEZER ppc=y ppc64=y
 HIBERNATION all=y
 PM_STD_PARTITION all=""
+#- Image Storage (you need at least one allocator)
+#- General Options
+#- No compression support available without Cryptoapi support.
 APM_EMULATION ppc=m
 PM_RUNTIME all=y
 
@@ -5212,22 +5885,18 @@ 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
 
 #-
@@ -5273,7 +5942,7 @@ DEBUG_FS all=y
 HEADERS_CHECK all=y
 DEBUG_KERNEL all=y
 DEBUG_SHIRQ all=n
-DETECT_SOFTLOCKUP all=y
+LOCKUP_DETECTOR all=y
 BOOTPARAM_SOFTLOCKUP_PANIC all=n
 DETECT_HUNG_TASK all=y
 BOOTPARAM_HUNG_TASK_PANIC all=n
@@ -5297,13 +5966,14 @@ DEBUG_LOCKING_API_SELFTESTS all=n
 DEBUG_KOBJECT all=n
 DEBUG_HIGHMEM i386=n sparc=n
 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
 DEBUG_SG all=n
 DEBUG_NOTIFIERS all=n
-DEBUG_CREDENTIALS all=n
+DEBUG_CREDENTIALS all=y
 FRAME_POINTER i386=y x86_64=y
 BOOT_PRINTK_DELAY all=n
 RCU_TORTURE_TEST all=m
@@ -5313,6 +5983,7 @@ BACKTRACE_SELF_TEST all=m
 DEBUG_BLOCK_EXT_DEVT all=n
 DEBUG_FORCE_WEAK_PER_CPU all=n
 LKDTM all=m
+CPU_NOTIFIER_ERROR_INJECT all=m
 FAULT_INJECTION all=n
 LATENCYTOP all=n
 SYSCTL_SYSCALL_CHECK all=n
@@ -5323,6 +5994,7 @@ FIREWIRE_OHCI_REMOTE_DMA all=n
 BUILD_DOCSRC all=n
 DYNAMIC_DEBUG all=n
 DMA_API_DEBUG all=n
+ATOMIC64_SELFTEST all=n
 #- file samples/Kconfig goes here
 #- file lib/Kconfig.kgdb goes here
 #- file lib/Kconfig.kmemcheck goes here
@@ -5334,6 +6006,9 @@ 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 ***
@@ -5343,21 +6018,28 @@ KMEMCHECK all=n
 #-
 #- *** FILE: mm/Kconfig ***
 #-
-FLATMEM_MANUAL all=n alpha=y ppc=y sparc=y
+FLATMEM_MANUAL all=n alpha=y ppc=y sparc=y sparc64=n
 DISCONTIGMEM_MANUAL all=n
-SPARSEMEM_MANUAL all=y alpha=n ppc=n sparc=n
+SPARSEMEM_MANUAL all=y alpha=n ppc=n sparc=n sparc64=y
 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
-KSM all=n
+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
 
+#-
+#- *** FILE: mm/Kconfig.debug ***
+#-
+DEBUG_PAGEALLOC all=n
+PAGE_POISONING sparc=n ia64=n alpha=n
+
 #-
 #- *** FILE: net/8021q/Kconfig ***
 #-
@@ -5385,6 +6067,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
@@ -5399,6 +6082,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
@@ -5415,6 +6099,7 @@ 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
 NET_PKTGEN all=m
 NET_TCPPROBE all=m
 NET_DROP_MONITOR all=y
@@ -5430,6 +6115,7 @@ 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/atm/Kconfig ***
@@ -5492,12 +6178,20 @@ BT_RFCOMM_TTY all=y
 #- *** FILE: net/bridge/Kconfig ***
 #-
 BRIDGE all=m
+BRIDGE_IGMP_SNOOPING all=y
 
 #-
 #- *** FILE: net/bridge/netfilter/Kconfig ***
 #-
 BRIDGE_EBT_NFLOG=m
 
+#-
+#- *** FILE: net/caif/Kconfig ***
+#-
+CAIF all=m
+CAIF_DEBUG all=n
+CAIF_NETDEV all=m
+
 #-
 #- *** FILE: net/can/Kconfig ***
 #-
@@ -5573,6 +6267,7 @@ NET_IPIP 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
@@ -5629,10 +6324,12 @@ INET6_XFRM_MODE_TUNNEL all=m
 INET6_XFRM_MODE_BEET all=m
 INET6_XFRM_MODE_ROUTEOPTIMIZATION all=m
 IPV6_SIT all=m
+IPV6_SIT_6RD all=y
 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
 
 #-
@@ -5671,6 +6368,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 ***
 #-
@@ -5690,6 +6396,7 @@ MAC80211 all=m sparc=n
 #- CFG80211 needs to be enabled for MAC80211
 MAC80211_RC_MINSTREL all=y
 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
@@ -5698,14 +6405,24 @@ MAC80211_DEBUG_MENU all=n
 #-
 #- *** FILE: net/netfilter/Kconfig ***
 #-
+NF_CONNTRACK_ZONES all=y
 NF_CT_PROTO_DCCP=m
+#- Xtables combined modules
+#- Xtables targets
+NETFILTER_XT_TARGET_CHECKSUM all=m
+NETFILTER_XT_TARGET_CT all=m
+NETFILTER_XT_TARGET_IDLETIMER all=m
 NETFILTER_XT_TARGET_RATEEST all=m
+NETFILTER_XT_TARGET_TEE all=m
 NETFILTER_XT_TARGET_TCPOPTSTRIP all=m
+#- Xtables matches
+NETFILTER_XT_MATCH_CPU all=m
 NETFILTER_XT_MATCH_IPRANGE all=m
+NETFILTER_XT_MATCH_IPVS all=m
+NETFILTER_XT_MATCH_OSF all=m
 NETFILTER_XT_MATCH_OWNER all=m
 NETFILTER_XT_MATCH_RATEEST all=m
 NETFILTER_XT_MATCH_TIME all=m
-NETFILTER_XT_MATCH_OSF all=m
 #- file net/netfilter/ipvs/Kconfig goes here
 
 #-
@@ -5720,6 +6437,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
@@ -5742,7 +6460,6 @@ NETLABEL all=y
 #- *** FILE: net/packet/Kconfig ***
 #-
 PACKET all=y
-PACKET_MMAP all=y
 
 #-
 #- *** FILE: net/phonet/Kconfig ***
@@ -5828,6 +6545,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
@@ -5869,14 +6587,14 @@ WIMAX_DEBUG_LEVEL all=8
 #-
 #- *** FILE: net/wireless/Kconfig ***
 #-
+WIRELESS_EXT all=y
 CFG80211 all=m sparc=n
-NL80211_TESTMODE all=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_WEXT all=y
 WIRELESS_EXT_SYSFS all=y
 LIB80211 all=m
 LIB80211_DEBUG all=n
@@ -5905,23 +6623,37 @@ SAMPLES all=n
 #-
 #- *** FILE: security/Kconfig ***
 #-
+#- file grsecurity/Kconfig goes here
 KEYS all=y
 KEYS_DEBUG_PROC_KEYS all=n
 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 all=y
+IMA all=n
 
 #-
 #- *** FILE: security/selinux/Kconfig ***
@@ -6058,8 +6790,6 @@ 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
@@ -6068,6 +6798,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
@@ -6095,7 +6826,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
@@ -6122,6 +6852,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
@@ -6160,6 +6891,7 @@ SND_ENS1370 all=m
 SND_ENS1371 all=m
 SND_ES1938 all=m
 SND_ES1968 all=m
+SND_ES1968_INPUT all=y
 SND_FM801 all=m
 SND_FM801_TEA575X_BOOL all=y
 SND_FM801_TEA575X all=m
@@ -6175,6 +6907,7 @@ SND_INTEL8X0M all=m sparc=m
 SND_KORG1212 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
@@ -6198,6 +6931,7 @@ 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
@@ -6239,9 +6973,13 @@ SND_SOC all=m
 #- 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/pxa/Kconfig goes here
 #- file sound/soc/s3c24xx/Kconfig goes here
 #- file sound/soc/s6000/Kconfig goes here
@@ -6258,6 +6996,9 @@ SND_SOC_ALL_CODECS all=m
 #- *** FILE: sound/soc/fsl/Kconfig ***
 #-
 SND_SOC_MPC5200_I2S all=m
+SND_SOC_MPC5200_AC97 powerpc=m
+SND_MPC52xx_SOC_PCM030 powerpc=m
+SND_MPC52xx_SOC_EFIKA powerpc=m
 
 #-
 #- *** FILE: sound/sparc/Kconfig ***
@@ -6277,6 +7018,7 @@ 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
@@ -6297,52 +7039,85 @@ INITRAMFS_COMPRESSION_LZMA all=n
 #-
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
-AGNX all=m
-CLASSIC_RCU all=y
-COMPAT_NET_DEV_OPS all=y
-DVB_SIANO_SMS1XXX all=m
-DVB_SIANO_SMS1XXX_SMS_IDS all=y
-EPL all=m
-EVENT_TRACER all=n
-EXT4DEV_COMPAT all=y
-FB_MATROX_MULTIHEAD all=y sparc64=n
-GIGASET_UNDOCREQ ppc=n ppc64=n
-HECI all=m
-HID_DEBUG all=n
-IWLWIFI_RFKILL all=y
-LBD all=y
-LEDS_LP5521 all=m
-MAC80211_DEFAULT_PS all=y
-MARKERS all=n
-ME0600 all=m
-ME0900 all=m
-ME1000 all=m
-ME1400 all=m
-ME1600 all=m
-ME4000 all=m
-ME4600 all=m
-ME6000 all=m
-ME8100 all=m
-ME8200 all=m
-MEDUMMY all=m
-MEILHAUS all=m
-PCF8575 all=m
-PROM_CONSOLE sparc=y sparc64=y
-RADIO_TYPHOON_PROC_FS alpha=y i386=y
-RDC_17F3101X all=m
-RT3070 all=m
-SECURITY_DEFAULT all=""
-SENSORS_FSCHER all=m
-SENSORS_FSCPOS all=m
-SENSORS_MAX6875 all=m
-SENSORS_PCA9539 all=m
-SENSORS_PCF8574 all=m
-STLC45XX all=m
-SXG all=m
-THINKPAD_ACPI_BAY i386=y x86_64=y
-UNEVICTABLE_LRU all=y
-USB_ATMEL all=m
-USB_CPC all=m
-USB_SERIAL_ATEN2011 all=m
-USB_SERIAL_QUATECH_ESU100 all=m
-WDT_501_PCI all=y
+AB4500_CORE all=m
+ALTERA_PCIE_CHDMA all=m
+ANDROID all=n
+ANDROID_BINDER_IPC all=n
+ANDROID_LOGGER all=n
+ANDROID_LOW_MEMORY_KILLER all=n
+ANDROID_RAM_CONSOLE all=n
+ANDROID_TIMED_GPIO all=n
+ARLAN i386=m
+ATH9K_DEBUG all=n
+B3DFG all=m
+BATMAN_DEBUG all=n
+BOOT_TRACER all=n
+BT_L2CAP_EXT_FEATURES all=y
+CRYPTO_MANAGER_TESTS all=y
+DEBUG_CFQ_IOSCHED all=n
+DEFAULT_AS all=n
+DETECT_SOFTLOCKUP all=y
+DST all=m
+DST_DEBUG all=n
+DT3155 all=m
+DX_SEP all=m
+ESPSERIAL alpha=m i386=m
+EVENT_PROFILE all=y
+FB_SM7XX_ACCEL all=y
+FORCEDETH_NAPI all=y
+GELIC_WIRELESS_OLD_PSK_INTERFACE ppc64=n
+GROUP_SCHED all=y
+HW_BRANCH_TRACER all=n
+I2C_DEBUG_CHIP all=n
+I2C_VOODOO3 all=m
+INOTIFY all=y
+INPUT_MIMIO all=m
+IOSCHED_AS all=y
+IWL3945_SPECTRUM_MEASUREMENT all=y
+IWLWIFI_LEDS all=y
+IWLWIFI_SPECTRUM_MEASUREMENT all=y
+KMEMTRACE all=n
+KSYM_TRACER all=n
+OCFS2_FS_POSIX_ACL all=n
+OUCHSCREEN_AD7879_SPI all=m
+PACKET_MMAP all=y
+PCI_LEGACY all=y
+PCMCIA_IOCTL all=y ppc=n ppc64=n x86_64=n
+PCMCIA_NETWAVE all=m
+PCMCIA_WAVELAN all=m
+PLAN9AUTH all=m
+POCH all=m
+POWER_TRACER all=n
+QT2160 all=m
+RAMZSWAP all=m
+RAMZSWAP_STATS all=y
+RT3090 all=m
+RTL8187SE all=m
+SECURITY_APPARMOR_DISABLE=n
+SECURITY_APPARMOR_NETWORK=y
+SECURITY_FILE_CAPABILITIES all=y
+SENSORS_ADT7473 all=m
+SLOW_WORK_DEBUG all=n
+SND_DT019X alpha=m i386=m
+SND_ES968 alpha=m i386=m
+SOUND_SSCAPE all=m
+SQUASHFS_XATTRS all=y
+STRIP all=m
+SYSPROF_TRACER all=n
+TSL2561 all=m
+UIO_SMX all=m
+USB_BERRY_CHARGE all=m
+USB_GSPCA_SN9C20X_EVDEV all=y
+USB_OV511 all=m
+USB_QUICKCAM_MESSENGER all=m
+USB_STV680 all=m
+USB_VST all=m
+USB_W9968CF all=m
+USB_ZC0301 all=m
+USER_SCHED all=n
+VIDEO_OVCAMCHIP all=m
+WAVELAN alpha=m i386=m
+WIRELESS_OLD_REGULATORY all=y
+WLAN_80211 all=y
+WLAN_PRE80211 all=y ppc=n ppc64=n
+WORKQUEUE_TRACER all=n