- updated for 2.6.35

Changed files:
    kernel-multiarch.config -> 1.41
    kernel-x86.config -> 1.25

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 29f01b78231e3b70a20f5b2a7d827350a1e5d7c6..d334837fb82aa06d70e45faf53077a5f45ce5ca1 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -4,6 +4,7 @@
 #-
 DEBUG_STRICT_USER_COPY_CHECKS all=n
 OPTPROBES all=y
+PCI_CNB20LE_QUIRK all=y
 
 #-
 #- *** FILE: block/Kconfig ***
@@ -21,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
@@ -39,6 +39,7 @@ CRYPTO_AEAD all=m
 CRYPTO_BLKCIPHER all=m
 CRYPTO_HASH all=y
 CRYPTO_MANAGER all=y
+CRYPTO_MANAGER_TESTS all=y
 CRYPTO_GF128MUL all=m
 CRYPTO_NULL all=m
 CRYPTO_PCRYPT all=m
@@ -146,6 +147,15 @@ 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
 
 #-
 #- *** FILE: drivers/ata/Kconfig ***
@@ -155,31 +165,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
@@ -187,47 +202,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 all=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 ***
@@ -398,6 +416,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
@@ -456,6 +475,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 ***
@@ -568,6 +588,7 @@ DMADEVICES_DEBUG all=n
 #- DMA Devices
 INTEL_IOATDMA i386=m x86_64=m
 FSL_DMA ppc=y ppc64=y
+TIMB_DMA all=m
 DMA_ENGINE all=y
 #- DMA Clients
 NET_DMA all=y
@@ -593,6 +614,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
@@ -658,12 +680,15 @@ 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 ***
@@ -714,21 +739,43 @@ HID all=m
 HIDRAW all=y
 #- file drivers/hid/usbhid/Kconfig goes here
 HID_3M_PCT all=m
+HID_CANDO all=m
+HID_PRODIKEYS all=m
+HID_DRAGONRISE all=m
 DRAGONRISE_FF all=y
+HID_EGALAX 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 ***
@@ -809,12 +856,15 @@ SENSORS_PCF8591 all=m
 SENSORS_SHT15 all=m
 SENSORS_SIS5595 all=m
 SENSORS_DME1737 all=m
+SENSORS_EMC1403 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
@@ -894,6 +944,7 @@ 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
@@ -904,7 +955,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
@@ -988,6 +1038,7 @@ BLK_DEV_UMC8672 alpha=m i386=m
 #-
 #- *** FILE: drivers/idle/Kconfig ***
 #-
+INTEL_IDLE all=m
 I7300_IDLE x86_64=m
 
 #-
@@ -1023,9 +1074,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
@@ -1044,6 +1097,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 ***
 #-
@@ -1065,6 +1123,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 ***
 #-
@@ -1162,9 +1225,10 @@ 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
@@ -1179,6 +1243,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
@@ -1194,6 +1261,7 @@ 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
@@ -1255,6 +1323,7 @@ TOUCHSCREEN_AD7877 all=m
 TOUCHSCREEN_AD7879_I2C 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
@@ -1291,6 +1360,7 @@ TOUCHSCREEN_TOUCHIT213 all=m
 TOUCHSCREEN_TSC2007 all=m
 TOUCHSCREEN_W90X900 all=m
 TOUCHSCREEN_PCAP all=m
+TOUCHSCREEN_TPS6507X all=m
 
 #-
 #- *** FILE: drivers/isdn/Kconfig ***
@@ -1434,6 +1504,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
@@ -1453,6 +1524,7 @@ LEDS_BD2802 all=m
 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
@@ -1529,6 +1601,18 @@ DM_UEVENT all=y
 #- *** FILE: drivers/media/IR/Kconfig ***
 #-
 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_IMON all=m
+
+#-
+#- *** FILE: drivers/media/IR/keymaps/Kconfig ***
+#-
+RC_MAP all=m
 
 #-
 #- *** FILE: drivers/media/Kconfig ***
@@ -1846,6 +1930,7 @@ VIDEO_ADV7175 all=m
 VIDEO_UPD64031A all=m
 VIDEO_UPD64083 all=m
 VIDEO_VIVI all=m
+#- file drivers/media/video/omap/Kconfig goes here
 #- file drivers/media/video/bt8xx/Kconfig goes here
 VIDEO_PMS all=m
 VIDEO_BWQCAM all=m
@@ -1905,6 +1990,8 @@ USB_STV680 all=m
 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 ***
@@ -1989,7 +2076,6 @@ 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
@@ -2159,11 +2245,13 @@ 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
@@ -2174,18 +2262,23 @@ MFD_PCF50633 all=m
 MFD_MC13783 all=m
 PCF50633_ADC all=m
 PCF50633_GPIO all=m
+ABX500_CORE all=y
 AB3100_CORE all=m
 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
 
 #-
 #- *** 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
@@ -2301,6 +2394,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
@@ -2398,6 +2492,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
@@ -2405,11 +2501,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
@@ -2530,7 +2629,6 @@ 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
@@ -2641,6 +2739,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
@@ -2706,6 +2805,12 @@ ARCNET_COM20020_PCI all=m
 #-
 BE2NET all=m
 
+#-
+#- *** FILE: drivers/net/caif/Kconfig ***
+#-
+#- CAIF transport drivers
+CAIF_TTY all=m
+
 #-
 #- *** FILE: drivers/net/can/Kconfig ***
 #-
@@ -2713,6 +2818,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
@@ -2960,6 +3066,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
@@ -2971,8 +3078,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
@@ -3015,6 +3121,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 ***
@@ -3074,6 +3182,7 @@ IWL3945 all=m
 #-
 IWM all=m
 IWM_DEBUG all=n
+IWM_TRACING all=n
 
 #-
 #- *** FILE: drivers/net/wireless/libertas/Kconfig ***
@@ -3090,6 +3199,7 @@ 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
@@ -3098,6 +3208,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 ***
@@ -3126,6 +3237,12 @@ 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 ***
 #-
@@ -3134,6 +3251,7 @@ WL1251 all=m
 WL1251_SPI all=m
 WL1251_SDIO all=m
 WL1271 all=m
+WL1271_SPI all=m
 
 #-
 #- *** FILE: drivers/net/wireless/zd1211rw/Kconfig ***
@@ -3218,7 +3336,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
@@ -3307,6 +3424,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
@@ -3416,6 +3534,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
@@ -3730,6 +3849,10 @@ 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 ***
@@ -3778,11 +3901,11 @@ 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
@@ -3809,6 +3932,7 @@ STAGING_EXCLUDE_BUILD all=n
 #- file drivers/staging/hv/Kconfig goes here
 #- file drivers/staging/vme/Kconfig goes here
 #- file drivers/staging/rar_register/Kconfig goes here
+#- file drivers/staging/memrar/Kconfig goes here
 #- file drivers/staging/sep/Kconfig goes here
 #- file drivers/staging/iio/Kconfig goes here
 #- file drivers/staging/ramzswap/Kconfig goes here
@@ -3816,18 +3940,21 @@ STAGING_EXCLUDE_BUILD all=n
 #- 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/dt3155/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/arlan/Kconfig ***
+#- *** FILE: drivers/staging/adis16255/Kconfig ***
 #-
-ARLAN i386=m
+ADIS16255 all=m
 
 #-
 #- *** FILE: drivers/staging/asus_oled/Kconfig ***
@@ -3845,9 +3972,86 @@ BATMAN_ADV_DEBUG all=n
 #-
 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_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 ***
@@ -3860,10 +4064,15 @@ CRYSTALHD 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
 
@@ -3872,6 +4081,12 @@ INPUT_GPIO all=m
 #-
 DT3155 all=m
 
+#-
+#- *** FILE: drivers/staging/dt3155v4l/Kconfig ***
+#-
+VIDEO_DT3155 all=m
+DT3155_CCIR all=y
+
 #-
 #- *** FILE: drivers/staging/echo/Kconfig ***
 #-
@@ -3909,6 +4124,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 ***
@@ -3919,6 +4135,8 @@ 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/trigger/Kconfig goes here
 
@@ -3926,6 +4144,9 @@ IIO_TRIGGER all=y
 #- *** 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
@@ -3937,6 +4158,20 @@ 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 ***
 #-
@@ -3956,9 +4191,9 @@ IIO_GPIO_TRIGGER all=m
 LINE6_USB 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 ***
@@ -3978,11 +4213,6 @@ PANEL_CHANGE_MESSAGE all=n
 #-
 IDE_PHISON all=m
 
-#-
-#- *** FILE: drivers/staging/poch/Kconfig ***
-#-
-POCH all=m
-
 #-
 #- *** FILE: drivers/staging/pohmelfs/Kconfig ***
 #-
@@ -4062,9 +4292,17 @@ SLICOSS all=m
 FB_SM7XX all=m
 
 #-
-#- *** FILE: drivers/staging/strip/Kconfig ***
+#- *** FILE: drivers/staging/ti-st/Kconfig ***
 #-
-STRIP all=m
+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 ***
@@ -4117,21 +4355,30 @@ 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/telephony/Kconfig ***
 #-
@@ -4246,6 +4493,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
@@ -4257,6 +4508,8 @@ 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_WEBCAM all=m
 
 #-
 #- *** FILE: drivers/usb/host/Kconfig ***
@@ -4343,6 +4596,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
 
 #-
@@ -4396,6 +4650,7 @@ 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
@@ -4417,6 +4672,7 @@ 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_DEBUG all=m
 
 #-
@@ -4555,6 +4811,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
@@ -4599,6 +4856,7 @@ 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
@@ -4607,6 +4865,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 ***
@@ -4762,8 +5022,8 @@ FS_XIP all=y
 #- file fs/jbd/Kconfig goes here
 #- file fs/jbd2/Kconfig goes here
 FS_MBCACHE all=m
-#- file fs/reiserfs/Kconfig goes here
 #- file fs/reiser4/Kconfig goes here
+#- file fs/reiserfs/Kconfig goes here
 #- file fs/jfs/Kconfig goes here
 FS_POSIX_ACL all=y
 #- file fs/xfs/Kconfig goes here
@@ -5276,6 +5536,11 @@ SMB_FS all=m
 SMB_NLS_DEFAULT all=y
 SMB_NLS_REMOTE all="iso8859-2"
 
+#-
+#- *** FILE: fs/squashfs/Kconfig ***
+#-
+SQUASHFS_XATTRS all=y
+
 #-
 #- *** FILE: fs/sysfs/Kconfig ***
 #-
@@ -5325,6 +5590,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
@@ -5367,6 +5633,8 @@ 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
@@ -5484,7 +5752,6 @@ PROFILE_ANNOTATED_BRANCHES all=n
 PROFILE_ALL_BRANCHES 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
@@ -5493,11 +5760,6 @@ FTRACE_STARTUP_TEST all=n
 MMIOTRACE x86=n
 RING_BUFFER_BENCHMARK all=m
 
-#-
-#- *** FILE: kernel/vserver/Kconfig ***
-#-
-VSERVER_LEGACY_MEM all=y
-
 #-
 #- *** FILE: lib/Kconfig ***
 #-
@@ -5581,6 +5843,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
@@ -5591,6 +5854,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
@@ -5602,6 +5866,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 ***
@@ -5618,6 +5885,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
@@ -5673,6 +5941,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
@@ -5704,6 +5973,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 ***
@@ -5732,6 +6002,7 @@ ROSE all=m
 #-
 BT all=m
 BT_L2CAP all=m
+BT_L2CAP_EXT_FEATURES all=y
 BT_SCO all=m
 #- file net/bluetooth/rfcomm/Kconfig goes here
 #- file net/bluetooth/bnep/Kconfig goes here
@@ -5773,6 +6044,13 @@ BRIDGE_IGMP_SNOOPING all=y
 #-
 BRIDGE_EBT_NFLOG=m
 
+#-
+#- *** FILE: net/caif/Kconfig ***
+#-
+CAIF all=m
+CAIF_DEBUG all=n
+CAIF_NETDEV all=m
+
 #-
 #- *** FILE: net/can/Kconfig ***
 #-
@@ -5848,6 +6126,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
@@ -5909,6 +6188,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
 
 #-
@@ -5947,6 +6227,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 ***
 #-
@@ -5966,6 +6255,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
@@ -5976,14 +6266,18 @@ MAC80211_DEBUG_MENU all=n
 #-
 NF_CONNTRACK_ZONES all=y
 NF_CT_PROTO_DCCP=m
+#- Xtables combined modules
+#- Xtables targets
 NETFILTER_XT_TARGET_CT 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_IPRANGE 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
 
 #-
@@ -6106,6 +6400,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
@@ -6193,6 +6488,7 @@ 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=y
 DEFAULT_SECURITY_SMACK all=n
@@ -6340,7 +6636,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_ES968 alpha=m i386=m
 SND_ES1688 alpha=m i386=m
 SND_ES18XX alpha=m i386=m
 SND_SC6000 alpha=m i386=m
@@ -6402,6 +6697,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
@@ -6440,6 +6736,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
@@ -6455,6 +6752,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
@@ -6582,6 +6880,7 @@ 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
@@ -6589,17 +6888,21 @@ 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
+DEBUG_CFQ_IOSCHED all=n
 DEFAULT_AS all=n
 DST all=m
 DST_DEBUG all=n
 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
 INPUT_MIMIO all=m
@@ -6610,19 +6913,29 @@ IWLWIFI_SPECTRUM_MEASUREMENT all=y
 OCFS2_FS_POSIX_ACL all=n
 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
 RT3090 all=m
 RTL8187SE all=m
 SECURITY_FILE_CAPABILITIES all=y
 SENSORS_ADT7473 all=m
 SND_DT019X alpha=m i386=m
+SND_ES968 alpha=m i386=m
 SOUND_SSCAPE all=m
+STRIP all=m
 TSL2561 all=m
 UIO_SMX all=m
 USB_BERRY_CHARGE all=m
+USB_GSPCA_SN9C20X_EVDEV all=y
 USB_VST all=m
 USER_SCHED all=n
+VSERVER_LEGACY_MEM all=y
+WAVELAN alpha=m i386=m
 WIRELESS_OLD_REGULATORY all=y
 WLAN_80211 all=y
 WLAN_PRE80211 all=y ppc=n ppc64=n

diff --git a/kernel-x86.config b/kernel-x86.config
index 9cebe54c66c89444bc55c6d4271e54d88ef9180c..4ab760285bfb58bd7e52f353f75e68af53d04792 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -138,7 +138,6 @@ IA32_AOUT x86_64=y
 #- file drivers/firmware/Kconfig goes here
 #- file fs/Kconfig goes here
 #- file arch/x86/Kconfig.debug goes here
-#- file kernel/vserver/Kconfig goes here
 #- file security/Kconfig goes here
 #- file crypto/Kconfig goes here
 #- file arch/x86/kvm/Kconfig goes here
@@ -176,7 +175,6 @@ GENERIC_CPU x86_64=y amd64=n
 X86_GENERIC i386=y i586=n i686=n pentium3=n pentium4=n athlon=n
 #* do we care ?
 X86_PPRO_FENCE i386=y pentium3= pentium4= athlon=
-X86_PTRACE_BTS i386=y x86_64=y
 
 #-
 #- *** FILE: arch/x86/Kconfig.debug ***
@@ -250,3 +248,4 @@ XEN i386=n
 #-
 OPROFILE_IBS x86=n
 X86_CPU_DEBUG x86=m
+X86_PTRACE_BTS i386=y x86_64=y