- rel 3; fix creds with vservers

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

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 4fe0676756ed67b2626a00a2699f9ee1f8e22cfd..b74b6027914f1753034ba256d3b1b3f7686c4a1c 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -3,6 +3,8 @@
 #- *** FILE: arch/* - ARCH SPECIFIC OPTIONS ***
 #-
 DEBUG_STRICT_USER_COPY_CHECKS all=n
+OPTPROBES all=y
+PCI_CNB20LE_QUIRK all=y
 
 #-
 #- *** FILE: block/Kconfig ***
@@ -20,7 +22,6 @@ IOSCHED_NOOP all=y
 IOSCHED_DEADLINE all=y
 IOSCHED_CFQ all=y
 CFQ_GROUP_IOSCHED all=y
-DEBUG_CFQ_IOSCHED all=n
 DEFAULT_DEADLINE all=n
 DEFAULT_CFQ all=y
 DEFAULT_NOOP all=n
@@ -38,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
@@ -108,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 ***
 #-
@@ -123,6 +131,7 @@ 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
@@ -144,6 +153,16 @@ X86_PM_TIMER x86=y
 ACPI_CONTAINER all=m
 ACPI_HOTPLUG_MEMORY all=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 ***
@@ -153,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
@@ -185,47 +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_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 ***
@@ -240,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
@@ -276,7 +303,7 @@ CFAG12864B_RATE i386=20 x86_64=20
 #-
 UEVENT_HELPER_PATH all="/sbin/hotplug"
 DEVTMPFS all=y
-DEVTMPFS_MOUNT all=n
+DEVTMPFS_MOUNT all=y
 STANDALONE all=n
 PREVENT_FIRMWARE_BUILD all=y
 FIRMWARE_IN_KERNEL all=n
@@ -362,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
@@ -396,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
@@ -454,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 ***
@@ -517,11 +547,6 @@ TCG_NSC all=m
 TCG_ATMEL all=m
 TCG_INFINEON all=m
 
-#-
-#- *** FILE: drivers/clocksource/Kconfig ***
-#-
-CS5535_CLOCK_EVENT_SRC all=m
-
 #-
 #- *** FILE: drivers/connector/Kconfig ***
 #-
@@ -567,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
@@ -595,6 +624,7 @@ 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
@@ -622,6 +652,7 @@ 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 ***
@@ -643,24 +674,32 @@ GPIOLIB all=y
 DEBUG_GPIO all=n
 GPIO_SYSFS all=y
 #- Memory mapped GPIO expanders:
+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 ***
@@ -686,6 +725,7 @@ 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 ***
@@ -697,6 +737,12 @@ DRM_RADEON_KMS all=y
 #-
 DRM_VMWGFX all=m
 
+#-
+#- *** FILE: drivers/gpu/vga/Kconfig ***
+#-
+VGA_ARB_MAX_GPUS all=16
+VGA_SWITCHEROO all=y
+
 #-
 #- *** FILE: drivers/hid/Kconfig ***
 #-
@@ -704,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 ***
@@ -742,10 +820,11 @@ 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
@@ -763,9 +842,11 @@ 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
@@ -790,13 +871,18 @@ 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
@@ -830,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 ***
@@ -878,7 +964,9 @@ 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
@@ -887,7 +975,6 @@ I2C_TINY_USB 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
@@ -895,9 +982,9 @@ SCx200_I2C_SDA i386=13
 SCx200_ACB i386=m
 
 #-
-#- *** FILE: drivers/i2c/chips/Kconfig ***
+#- *** FILE: drivers/i2c/muxes/Kconfig ***
 #-
-SENSORS_TSL2550 all=m
+I2C_MUX_PCA954x all=m
 
 #-
 #- *** FILE: drivers/ide/Kconfig ***
@@ -976,6 +1063,7 @@ 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
 
 #-
@@ -1011,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
@@ -1032,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 ***
 #-
@@ -1053,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 ***
 #-
@@ -1150,12 +1250,14 @@ 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
@@ -1167,6 +1269,9 @@ 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
@@ -1182,9 +1287,13 @@ 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 ***
@@ -1240,9 +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
@@ -1254,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
@@ -1279,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 ***
@@ -1389,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 ***
@@ -1422,6 +1537,7 @@ 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
@@ -1440,8 +1556,10 @@ LEDS_REGULATOR all=m
 LEDS_BD2802 all=m
 LEDS_INTEL_SS4200 all=m
 LEDS_LT3593 all=m
-#- LED Triggers
+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
@@ -1496,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
@@ -1515,7 +1632,24 @@ 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 ***
@@ -1576,6 +1710,8 @@ DVB_CAPTURE_DRIVERS all=y
 #- 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
 
@@ -1630,6 +1766,7 @@ 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 ***
@@ -1703,6 +1840,11 @@ 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 ***
 #-
@@ -1767,7 +1909,9 @@ 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 ***
@@ -1823,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
@@ -1866,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 ***
@@ -1902,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 ***
@@ -1948,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
@@ -1956,11 +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
@@ -1969,8 +2117,10 @@ 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
@@ -2037,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 ***
 #-
@@ -2044,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 ***
@@ -2057,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 ***
 #-
@@ -2125,30 +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 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
-AB4500_CORE all=m
+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
@@ -2158,12 +2318,18 @@ 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
 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
@@ -2226,7 +2392,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
@@ -2261,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
@@ -2358,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
@@ -2365,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
@@ -2415,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
@@ -2485,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
@@ -2555,7 +2728,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
@@ -2568,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
@@ -2585,6 +2760,7 @@ MLX4_EN all=m
 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
@@ -2597,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
@@ -2662,6 +2839,14 @@ 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 ***
 #-
@@ -2669,6 +2854,7 @@ 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
@@ -2683,11 +2869,13 @@ 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 ***
@@ -2781,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
@@ -2837,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
@@ -2854,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 ***
@@ -2911,6 +3103,7 @@ WIMAX_I2400M_DEBUG_LEVEL all=8
 WLAN all=y
 PCMCIA_RAYCS all=m
 LIBERTAS_THINFIRM all=m
+LIBERTAS_THINFIRM_DEBUG all=n
 LIBERTAS_THINFIRM_USB all=m
 AIRO all=m
 ATMEL all=m
@@ -2922,8 +3115,7 @@ 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
@@ -2966,6 +3158,8 @@ ATH5K_DEBUG all=n
 #-
 ATH9K all=m
 ATH9K_DEBUGFS all=n
+ATH9K_HTC all=m
+ATH9K_HTC_DEBUGFS all=y
 
 #-
 #- *** FILE: drivers/net/wireless/b43/Kconfig ***
@@ -3013,20 +3207,19 @@ LIBIPW_DEBUG all=n
 #- *** FILE: drivers/net/wireless/iwlwifi/Kconfig ***
 #-
 IWLWIFI all=m
-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 ***
@@ -3037,11 +3230,13 @@ 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
@@ -3050,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 ***
@@ -3067,12 +3263,23 @@ 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 ***
 #-
@@ -3081,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 ***
@@ -3117,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
@@ -3147,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 ***
@@ -3166,7 +3375,6 @@ PCIEAER_INJECT all=m
 PCCARD all=m
 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
@@ -3182,7 +3390,7 @@ 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 ***
@@ -3201,6 +3409,7 @@ 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
@@ -3210,6 +3419,7 @@ 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
@@ -3217,6 +3427,10 @@ 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 ***
@@ -3254,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
@@ -3261,28 +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_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
@@ -3291,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 ***
@@ -3310,9 +3541,11 @@ 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
@@ -3352,6 +3585,7 @@ 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
@@ -3640,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
@@ -3665,6 +3903,11 @@ 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 ***
@@ -3713,88 +3956,207 @@ 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/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/dream/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/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/ramzswap/Kconfig goes here
+#- 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/strip/Kconfig goes here
-#- file drivers/staging/arlan/Kconfig goes here
-#- file drivers/staging/wavelan/Kconfig goes here
-#- file drivers/staging/netwave/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/altpciechdma/Kconfig ***
+#- *** FILE: drivers/staging/adis16255/Kconfig ***
 #-
-ALTERA_PCIE_CHDMA all=m
-
-#-
-#- *** FILE: drivers/staging/arlan/Kconfig ***
-#-
-ARLAN i386=m
+ADIS16255 all=m
 
 #-
 #- *** FILE: drivers/staging/asus_oled/Kconfig ***
 #-
 ASUS_OLED all=m
 
-#-
-#- *** FILE: drivers/staging/b3dfg/Kconfig ***
-#-
-B3DFG all=m
-
 #-
 #- *** FILE: drivers/staging/batman-adv/Kconfig ***
 #-
 BATMAN_ADV all=m
-BATMAN_DEBUG all=n
+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 ***
@@ -3802,13 +4164,29 @@ 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/dt3155v4l/Kconfig ***
+#-
+VIDEO_DT3155 all=m
+DT3155_CCIR all=y
+
+#-
+#- *** FILE: drivers/staging/easycap/Kconfig ***
+#-
+EASYCAP all=m
+
 #-
 #- *** FILE: drivers/staging/echo/Kconfig ***
 #-
@@ -3846,6 +4224,7 @@ HYPERV all=m
 HYPERV_STORAGE all=m
 HYPERV_BLOCK all=m
 HYPERV_NET all=m
+HYPERV_UTILS all=m
 
 #-
 #- *** FILE: drivers/staging/iio/Kconfig ***
@@ -3856,13 +4235,19 @@ 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
@@ -3874,12 +4259,32 @@ SCA3000 all=m
 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
 SENSORS_TSL2563 all=m
 
+#-
+#- *** FILE: drivers/staging/iio/magnetometer/Kconfig ***
+#-
+#- Magnetometer sensors
+SENSORS_HMC5843 all=m
+
 #-
 #- *** FILE: drivers/staging/iio/trigger/Kconfig ***
 #-
@@ -3893,24 +4298,36 @@ IIO_GPIO_TRIGGER 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/netwave/Kconfig ***
+#- *** FILE: drivers/staging/memrar/Kconfig ***
 #-
-PCMCIA_NETWAVE all=m
+MRST_RAR_HANDLER all=m
 
 #-
-#- *** FILE: drivers/staging/otus/Kconfig ***
+#- *** FILE: drivers/staging/mrst-touchscreen/Kconfig ***
 #-
-OTUS all=m
+TOUCHSCREEN_INTEL_MID all=m
 
 #-
-#- *** FILE: drivers/staging/p9auth/Kconfig ***
+#- *** FILE: drivers/staging/otus/Kconfig ***
 #-
-PLAN9AUTH all=m
+OTUS all=m
 
 #-
 #- *** FILE: drivers/staging/panel/Kconfig ***
@@ -3925,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 ***
 #-
@@ -3943,15 +4355,9 @@ POHMELFS_CRYPTO all=y
 USB_SERIAL_QUATECH_USB2 all=m
 
 #-
-#- *** FILE: drivers/staging/ramzswap/Kconfig ***
-#-
-RAMZSWAP all=m
-RAMZSWAP_STATS all=y
-
-#-
-#- *** FILE: drivers/staging/rar/Kconfig ***
+#- *** FILE: drivers/staging/quickstart/Kconfig ***
 #-
-RAR_REGISTER all=m
+ACPI_QUICKSTART all=m
 
 #-
 #- *** FILE: drivers/staging/rt2860/Kconfig ***
@@ -3988,11 +4394,6 @@ RTL8192U all=m
 #-
 SAMSUNG_LAPTOP all=m
 
-#-
-#- *** FILE: drivers/staging/sep/Kconfig ***
-#-
-DX_SEP all=m
-
 #-
 #- *** FILE: drivers/staging/serqt_usb2/Kconfig ***
 #-
@@ -4007,12 +4408,32 @@ SLICOSS all=m
 #- *** FILE: drivers/staging/sm7xx/Kconfig ***
 #-
 FB_SM7XX all=m
-FB_SM7XX_ACCEL all=y
 
 #-
-#- *** FILE: drivers/staging/strip/Kconfig ***
+#- *** FILE: drivers/staging/solo6x10/Kconfig ***
 #-
-STRIP all=m
+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 ***
@@ -4025,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 ***
@@ -4032,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 ***
@@ -4057,21 +4486,36 @@ VT6655 all=m
 VT6656 all=m
 
 #-
-#- *** FILE: drivers/staging/wavelan/Kconfig ***
+#- *** FILE: drivers/staging/winbond/Kconfig ***
 #-
-WAVELAN alpha=m i386=m
-PCMCIA_WAVELAN all=m
+W35UND all=m
 
 #-
-#- *** FILE: drivers/staging/winbond/Kconfig ***
+#- *** FILE: drivers/staging/wlags49_h2/Kconfig ***
 #-
-W35UND all=m
+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 ***
 #-
@@ -4091,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 ***
@@ -4186,6 +4630,10 @@ 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
@@ -4193,9 +4641,15 @@ 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 ***
@@ -4250,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
@@ -4263,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 ***
@@ -4284,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
 
 #-
@@ -4337,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
@@ -4356,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
 
 #-
@@ -4394,6 +4852,11 @@ 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 ***
 #-
@@ -4489,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
@@ -4527,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
@@ -4540,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 ***
@@ -4636,6 +5104,7 @@ 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
@@ -4649,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
@@ -4696,7 +5166,6 @@ FS_XIP all=y
 #- file fs/jbd2/Kconfig goes here
 FS_MBCACHE all=m
 #- file fs/reiserfs/Kconfig goes here
-#- file fs/reiser4/Kconfig goes here
 #- file fs/jfs/Kconfig goes here
 FS_POSIX_ACL all=y
 #- file fs/xfs/Kconfig goes here
@@ -4735,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
@@ -4746,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
@@ -4756,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
@@ -4827,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 ***
 #-
@@ -4838,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
 
 #-
@@ -5002,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 ***
 #-
@@ -5029,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 ***
@@ -5096,7 +5581,6 @@ DNOTIFY all=y
 #-
 #- *** FILE: fs/notify/inotify/Kconfig ***
 #-
-INOTIFY all=y
 INOTIFY_USER all=y
 
 #-
@@ -5168,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
@@ -5195,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 ***
 #-
@@ -5244,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
@@ -5268,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
@@ -5287,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
@@ -5318,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
@@ -5328,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
@@ -5394,21 +5885,14 @@ 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
-KSYM_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
@@ -5458,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
@@ -5482,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
@@ -5498,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
@@ -5508,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
@@ -5519,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 ***
@@ -5535,6 +6025,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
@@ -5576,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
@@ -5590,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
@@ -5606,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
@@ -5621,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 ***
@@ -5683,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 ***
 #-
@@ -5764,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
@@ -5825,6 +6329,7 @@ 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
 
 #-
@@ -5863,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 ***
 #-
@@ -5882,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
@@ -5890,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
 
 #-
@@ -5912,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
@@ -5934,7 +6460,6 @@ NETLABEL all=y
 #- *** FILE: net/packet/Kconfig ***
 #-
 PACKET all=y
-PACKET_MMAP all=y
 
 #-
 #- *** FILE: net/phonet/Kconfig ***
@@ -6020,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
@@ -6068,7 +6594,6 @@ CFG80211_DEVELOPER_WARNINGS all=n
 CFG80211_REG_DEBUG all=n
 CFG80211_DEFAULT_PS all=y
 CFG80211_DEBUGFS all=n
-WIRELESS_OLD_REGULATORY all=y
 CFG80211_WEXT all=y
 WIRELESS_EXT_SYSFS all=y
 LIB80211 all=m
@@ -6098,6 +6623,7 @@ SAMPLES all=n
 #-
 #- *** FILE: security/Kconfig ***
 #-
+#- file grsecurity/Kconfig goes here
 KEYS all=y
 KEYS_DEBUG_PROC_KEYS all=n
 SECURITY all=y
@@ -6110,16 +6636,24 @@ LSM_MMAP_MIN_ADDR all=0 x86_64=65536 i386=65536 sparc64=8192 ppc=65536
 #- file security/tomoyo/Kconfig goes here
 #- file security/apparmor/Kconfig goes here
 #- file security/integrity/ima/Kconfig goes here
-DEFAULT_SECURITY_SELINUX all=y
+DEFAULT_SECURITY_SELINUX all=n
 DEFAULT_SECURITY_SMACK all=n
 DEFAULT_SECURITY_TOMOYO all=n
-DEFAULT_SECURITY_DAC all=n
-CONFIG_DEFAULT_SECURITY all="selinux"
+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 ***
@@ -6256,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
@@ -6266,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
@@ -6319,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
@@ -6357,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
@@ -6372,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
@@ -6437,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
@@ -6478,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
@@ -6498,25 +7039,85 @@ INITRAMFS_COMPRESSION_LZMA all=n
 #-
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
+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