- initial config update

Changed files:
    kernel-multiarch.config -> 1.55
    kernel-x86.config -> 1.29

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 2e56c1030f7672b728bade125bd2355fb1282426..9d2f6130816c08e88e847d34c2935abe7063cff1 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -13,6 +13,7 @@ BLOCK all=y
 LBDAF i386=y ppc=y sparc=y sparc64=
 BLK_DEV_BSG all=y
 BLK_DEV_INTEGRITY all=y
+BLK_DEV_THROTTLING all=y
 #- file block/Kconfig.iosched goes here
 
 #-
@@ -111,11 +112,6 @@ 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 ***
 #-
@@ -130,7 +126,6 @@ ACPI_SLEEP x86=y
 ACPI_PROCFS all=y
 ACPI_PROCFS_POWER ia64=y x86=y
 ACPI_POWER_METER all=m
-ACPI_SYSFS_POWER ia64=y x86=y
 ACPI_EC_DEBUGFS all=m
 ACPI_PROC_EVENT all=y
 ACPI_AC x86=m
@@ -181,7 +176,6 @@ SATA_SIL24 all=m sparc=n
 ATA_SFF all=y 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
@@ -206,7 +200,7 @@ PATA_CMD64X all=m sparc=n
 PATA_CS5520 all=m sparc=n
 PATA_CS5530 all=m sparc=n
 PATA_CS5535 i386=m
-PATA_CS5536 i386=m
+PATA_CS5536 all=m
 PATA_CYPRESS all=m sparc=n
 PATA_EFAR all=m sparc=n
 PATA_HPT366 all=m sparc=n
@@ -218,6 +212,7 @@ PATA_IT8213 all=m
 PATA_IT821X all=m sparc=n
 PATA_JMICRON all=m sparc=n
 PATA_MARVELL all=m sparc=n
+PATA_MPC52xx ppc=m
 PATA_NETCELL all=m sparc=n
 PATA_NINJA32 all=m
 PATA_NS87415 all=m
@@ -346,6 +341,7 @@ SUNVDC sparc64=m
 #- file drivers/s390/block/Kconfig goes here
 VIRTIO_BLK all=m
 BLK_DEV_HD all=n
+BLK_DEV_RBD all=m
 
 #-
 #- *** FILE: drivers/block/drbd/Kconfig ***
@@ -612,6 +608,7 @@ EDAC all=y
 #- Reporting subsystems
 EDAC_DEBUG all=n
 EDAC_DECODE_MCE all=m
+EDAC_MCE_INJ all=m
 EDAC_MM_EDAC all=m
 EDAC_AMD64 x86_64=m
 EDAC_AMD64_ERROR_INJECTION x86_64=y
@@ -629,6 +626,7 @@ EDAC_I82860 i386=m
 EDAC_R82600 i386=m
 EDAC_I5000 i386=m x86_64=m
 EDAC_I5100 i386=m x86_64=m
+EDAC_I7300 all=m
 EDAC_PASEMI ppc64=m
 EDAC_CELL ppc64=m
 EDAC_AMD8131 powerpc=m
@@ -645,13 +643,10 @@ EISA_NAMES alpha=y i386=y
 #-
 #- *** FILE: drivers/firewire/Kconfig ***
 #-
-#- You can enable one or both FireWire driver stacks.
-#- The newer stack is recommended.
 FIREWIRE all=n ia64=m ppc=m ppc64=m x86_64=m
 FIREWIRE_OHCI all=m
 FIREWIRE_SBP2 all=m
 FIREWIRE_NET all=m
-#- file drivers/ieee1394/Kconfig goes here
 FIREWIRE_NOSY all=m
 
 #-
@@ -674,9 +669,11 @@ GPIOLIB all=y
 DEBUG_GPIO all=n
 GPIO_SYSFS all=y
 #- Memory mapped GPIO expanders:
+GPIO_BASIC_MMIO all=m
 GPIO_IT8761E all=m
 GPIO_XILINX powerpc=y
 GPIO_SCH all=m
+GPIO_VX855 all=m
 #- I2C GPIO expanders:
 GPIO_MAX7300 all=m
 GPIO_MAX732X all=m
@@ -690,12 +687,14 @@ GPIO_ADP5588 all=m
 GPIO_CS5535 all=m
 GPIO_BT8XX all=m
 GPIO_LANGWELL all=n
+GPIO_PCH all=m
 GPIO_TIMBERDALE all=y
 GPIO_RDC321X all=m
 #- SPI GPIO expanders:
 GPIO_MAX7301 all=m
 GPIO_MCP23S08 all=m
 GPIO_MC33880 all=m
+GPIO_74X164 all=m
 #- AC97 GPIO expanders:
 GPIO_UCB1400 all=y
 #- MODULbus GPIO expanders:
@@ -737,6 +736,11 @@ DRM_RADEON_KMS all=y
 #-
 DRM_VMWGFX all=m
 
+#-
+#- *** FILE: drivers/gpu/stub/Kconfig ***
+#-
+STUB_POULSBO all=m
+
 #-
 #- *** FILE: drivers/gpu/vga/Kconfig ***
 #-
@@ -758,11 +762,14 @@ HID_DRAGONRISE all=m
 DRAGONRISE_FF all=y
 HID_EGALAX all=m
 HID_ELECOM all=m
+HID_UCLOGIC all=m
+HID_WALTOP all=m
 HID_GYRATION all=m
 HID_TWINHAN all=m
 LOGITECH_FF all=y
 LOGIRUMBLEPAD2_FF all=y
 LOGIG940_FF all=y
+LOGIWII_FF all=y
 HID_MAGICMOUSE all=m
 HID_MOSART all=m
 HID_NTRIG all=m
@@ -774,6 +781,7 @@ HID_PICOLCD all=m
 HID_QUANTA all=m
 HID_ROCCAT all=m
 HID_ROCCAT_KONE all=m
+HID_ROCCAT_PYRA all=m
 HID_SAMSUNG all=m
 HID_SONY all=m
 HID_STANTUM all=m
@@ -827,9 +835,6 @@ SENSORS_ADT7475 all=m
 SENSORS_ASC7621 all=m
 SENSORS_K8TEMP all=m
 SENSORS_K10TEMP all=m
-SENSORS_AMS ppc=m
-SENSORS_AMS_PMU ppc=y
-SENSORS_AMS_I2C ppc=y
 SENSORS_ASB100 all=m
 SENSORS_ATXP1 all=m
 SENSORS_DS1621 all=m
@@ -841,6 +846,7 @@ SENSORS_FSCHMD all=m
 SENSORS_G760A all=m
 SENSORS_GL518SM all=m
 SENSORS_GL520SM all=m
+SENSORS_GPIO_FAN all=m
 SENSORS_CORETEMP all=m
 SENSORS_PKGTEMP all=m
 SENSORS_IBMAEM all=m
@@ -862,6 +868,7 @@ SENSORS_LM92 all=m
 SENSORS_LM93 all=m
 SENSORS_LTC4215 all=m
 SENSORS_LTC4245 all=m
+SENSORS_LTC4261 all=m
 SENSORS_LM95241 all=m
 SENSORS_MAX1111 all=m
 SENSORS_MAX1619 all=m
@@ -893,6 +900,8 @@ SENSORS_W83781D all=m
 SENSORS_W83791D all=m
 SENSORS_W83792D all=m
 SENSORS_W83793 all=m
+SENSORS_W83795 all=m
+SENSORS_W83795_FANCTRL all=n
 SENSORS_W83L785TS all=m
 SENSORS_W83L786NG all=m
 SENSORS_W83627HF all=m
@@ -900,7 +909,6 @@ SENSORS_W83627EHF all=m
 SENSORS_WM831X all=m
 SENSORS_WM8350 all=m
 SENSORS_ULTRA45 sparc64=m
-SENSORS_HDAPS all=m
 SENSORS_LIS3_SPI all=m
 SENSORS_LIS3_I2C all=m
 SENSORS_APPLESMC all=m
@@ -961,6 +969,7 @@ I2C_POWERMAC ppc=m ppc64=m
 #- I2C system bus drivers (mostly embedded / system-on-chip)
 I2C_DESIGNWARE powerpc=m
 I2C_GPIO all=m
+I2C_INTEL_MID all=m
 I2C_MPC ppc=n
 I2C_OCORES all=m
 I2C_PASEMI ppc64=m
@@ -984,6 +993,7 @@ SCx200_ACB i386=m
 #-
 #- *** FILE: drivers/i2c/muxes/Kconfig ***
 #-
+I2C_MUX_PCA9541 all=m
 I2C_MUX_PCA954x all=m
 
 #-
@@ -1066,23 +1076,6 @@ BLK_DEV_UMC8672 alpha=m i386=m
 INTEL_IDLE all=n i386=y x86_64=y
 I7300_IDLE x86_64=m
 
-#-
-#- *** FILE: drivers/ieee1394/Kconfig ***
-#-
-IEEE1394 all=m sparc=n
-IEEE1394_OHCI1394 all=m sparc=
-#- PCILynx controller requires I2C
-IEEE1394_PCILYNX all=m sparc=
-#- SBP-2 support (for storage devices) requires SCSI
-IEEE1394_SBP2 all=m sparc=
-IEEE1394_SBP2_PHYS_DMA all=n
-IEEE1394_ETH1394_ROM_ENTRY all=y sparc=
-IEEE1394_ETH1394 all=m sparc=
-IEEE1394_RAWIO all=m sparc=
-IEEE1394_VIDEO1394 all=m sparc=
-IEEE1394_DV1394 all=m sparc=
-IEEE1394_VERBOSEDEBUG all=n sparc=
-
 #-
 #- *** FILE: drivers/ieee802154/Kconfig ***
 #-
@@ -1253,6 +1246,7 @@ KEYBOARD_ATKBD all=y sparc=m sparc64=m
 KEYBOARD_QT2160 all=m
 KEYBOARD_LKKBD all=m
 KEYBOARD_GPIO all=m
+KEYBOARD_GPIO_POLLED all=m
 KEYBOARD_TCA6416 all=m
 KEYBOARD_MATRIX all=m
 KEYBOARD_LM8323 all=m
@@ -1332,6 +1326,7 @@ SERIO_LIBPS2 all=y sparc=m sparc64=m
 SERIO_RAW all=m
 SERIO_XILINX_XPS_PS2 all=m
 SERIO_ALTERA_PS2 all=m
+SERIO_PS2MULT all=m
 
 #-
 #- *** FILE: drivers/input/tablet/Kconfig ***
@@ -1340,6 +1335,7 @@ INPUT_TABLET all=y sparc=n
 TABLET_USB_ACECAD all=m
 TABLET_USB_AIPTEK all=m
 TABLET_USB_GTCO all=m
+TABLET_USB_HANWANG all=m
 TABLET_USB_KBTAB all=m
 TABLET_USB_WACOM all=m
 
@@ -1352,6 +1348,7 @@ TOUCHSCREEN_AD7877 all=m
 TOUCHSCREEN_AD7879 all=m
 TOUCHSCREEN_AD7879_I2C all=m
 TOUCHSCREEN_AD7879_SPI all=m
+TOUCHSCREEN_BU21013 all=m
 TOUCHSCREEN_CY8CTMG110 all=m
 TOUCHSCREEN_DA9034 all=m
 TOUCHSCREEN_DYNAPRO all=m
@@ -1364,6 +1361,7 @@ TOUCHSCREEN_WACOM_W8001 all=m
 TOUCHSCREEN_MCS5000 all=m
 TOUCHSCREEN_MTOUCH all=m
 TOUCHSCREEN_INEXIO all=m
+TOUCHSCREEN_INTEL_MID all=m
 TOUCHSCREEN_MK712 all=m sparc=n
 TOUCHSCREEN_HTCPEN all=m
 TOUCHSCREEN_PENMOUNT all=m
@@ -1546,6 +1544,8 @@ LEDS_GPIO all=m
 LEDS_GPIO_PLATFORM all=y
 LEDS_GPIO_OF powerpc=y sparc=y
 LEDS_LP3944 all=m
+LEDS_LP5521 all=m
+LEDS_LP5523 all=m
 LEDS_CLEVO_MAIL all=m
 LEDS_PCA955X all=m
 LEDS_WM831X_STATUS all=m
@@ -1596,6 +1596,9 @@ THERM_PM72 ppc64=n
 WINDFARM ppc=m ppc64=n
 ANSLCD ppc=m
 PMAC_RACKMETER ppc=m ppc64=m
+SENSORS_AMS ppc=m
+SENSORS_AMS_PMU ppc=y
+SENSORS_AMS_I2C ppc=y
 
 #-
 #- *** FILE: drivers/mca/Kconfig ***
@@ -1640,10 +1643,12 @@ IR_RC5_DECODER all=m
 IR_RC6_DECODER all=m
 IR_JVC_DECODER all=m
 IR_SONY_DECODER all=m
+IR_RC5_SZ_DECODER all=m
 IR_LIRC_CODEC all=m
+IR_ENE all=m
 IR_IMON all=m
 IR_MCEUSB all=m
-IR_ENE all=m
+IR_NUVOTON all=m
 IR_STREAMZAP all=m
 
 #-
@@ -1816,7 +1821,6 @@ DVB_OR51211 all=m
 DVB_OR51132 all=m
 DVB_BCM3510 all=m
 DVB_LGDT330X all=m
-DVB_LGDT3304 all=m
 DVB_S5H1409 all=m
 DVB_AU8522 all=m
 DVB_S5H1411 all=m
@@ -1974,13 +1978,7 @@ VIDEO_PMS all=m
 VIDEO_BWQCAM all=m
 VIDEO_CQCAM all=m
 VIDEO_W9966 all=m
-VIDEO_CPIA all=m sparc=n
-VIDEO_CPIA_PP all=m
-VIDEO_CPIA_USB all=m
 #- file drivers/media/video/cpia2/Kconfig goes here
-VIDEO_SAA5246A all=m
-VIDEO_SAA5249 all=m
-VIDEO_STRADIS all=m ppc=n sparc=n
 #- file drivers/media/video/zoran/Kconfig goes here
 VIDEO_MEYE i386=m x86_64=m
 #- file drivers/media/video/saa7134/Kconfig goes here
@@ -2285,10 +2283,12 @@ TWL4030_CORE powerpc=y
 PMIC_DA903X powerpc=y
 MFD_WM8400 all=m
 MFD_WM831X all=y
+MFD_WM831X_SPI all=y
 MFD_WM8350_I2C all=y
 MFD_WM8994 all=y
 MFD_PCF50633 all=m
 MFD_MC13783 all=m
+MFD_MC13XXX all=m
 PCF50633_ADC all=m
 PCF50633_GPIO all=m
 ABX500_CORE all=y
@@ -2301,6 +2301,7 @@ LPC_SCH all=m
 MFD_RDC321X all=m
 MFD_JANZ_CMODIO all=m
 MFD_TPS6586X all=m
+MFD_VX855 all=m
 
 #-
 #- *** FILE: drivers/misc/Kconfig ***
@@ -2322,18 +2323,24 @@ 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
+APDS9802ALS all=m
 ISL29003 all=m
+ISL29020 all=m
 SENSORS_TSL2550 all=m
 SENSORS_BH1780 all=m
+SENSORS_BH1770 all=m
+SENSORS_APDS990X all=m
 HMC6352 all=m
 DS1682 all=m
 TI_DAC7512 all=m
 VMWARE_BALLOON all=m
 BMP085 all=m
+PCH_PHUB all=m
 #- file drivers/misc/c2port/Kconfig goes here
 #- file drivers/misc/eeprom/Kconfig goes here
 #- file drivers/misc/cb710/Kconfig goes here
 #- file drivers/misc/iwmc3200top/Kconfig goes here
+#- file drivers/misc/ti-st/Kconfig goes here
 
 #-
 #- *** FILE: drivers/misc/c2port/Kconfig ***
@@ -2363,6 +2370,11 @@ IWMC3200TOP all=m
 IWMC3200TOP_DEBUG all=n
 IWMC3200TOP_DEBUGFS all=n
 
+#-
+#- *** FILE: drivers/misc/ti-st/Kconfig ***
+#-
+TI_ST all=m
+
 #-
 #- *** FILE: drivers/mmc/Kconfig ***
 #-
@@ -2377,6 +2389,7 @@ MMC_DEBUG all=n
 #-
 #- MMC/SD/SDIO Card Drivers
 MMC_BLOCK all=m
+MMC_BLOCK_MINORS all=8
 MMC_BLOCK_BOUNCE all=y
 SDIO_UART all=m
 MMC_TEST all=n
@@ -2401,6 +2414,7 @@ MMC_SPI all=m
 MMC_SDRICOH_CS all=m
 MMC_CB710 all=m
 MMC_VIA_SDMMC all=m
+MMC_USHC all=m
 
 #-
 #- *** FILE: drivers/mtd/Kconfig ***
@@ -2578,6 +2592,7 @@ MTD_UBI_GLUEBI all=n powerpc=m
 #-
 #- UBI debugging options
 MTD_UBI_DEBUG all=n
+#- Additional UBI debugging messages
 
 #-
 #- *** FILE: drivers/net/Kconfig ***
@@ -2593,9 +2608,9 @@ TUN all=m
 VETH all=m
 NET_SB1000 all=m
 #- file drivers/net/arcnet/Kconfig goes here
+MII all=m
 #- file drivers/net/phy/Kconfig goes here
 NET_ETHERNET all=y
-MII all=m
 #- file drivers/net/arm/Kconfig goes here
 MACE ppc=m
 MACE_AAUI_PORT ppc=y
@@ -2736,6 +2751,7 @@ ATL1E all=m
 ATL1C all=m
 JME all=m
 #- file drivers/net/stmmac/Kconfig goes here
+PCH_GBE all=m
 NETDEV_10000 all=y
 CHELSIO_T1 all=m sparc=n
 CHELSIO_T1_1G all=y
@@ -2762,6 +2778,7 @@ TEHUTI all=m
 BNX2X all=m
 QLCNIC all=m
 QLGE all=m
+BNA all=m
 #- file drivers/net/sfc/Kconfig goes here
 #- file drivers/net/benet/Kconfig goes here
 #- file drivers/net/tokenring/Kconfig goes here
@@ -2792,6 +2809,7 @@ PPP_DEFLATE all=m
 PPP_BSDCOMP all=m
 PPP_MPPE all=m
 PPPOE all=m
+PPTP all=m
 PPPOATM all=m
 PPPOL2TP all=m
 SLIP all=m
@@ -2855,6 +2873,7 @@ CAN_DEV all=m
 CAN_CALC_BITTIMING all=y
 CAN_MCP251X all=m
 CAN_JANZ_ICAN3 all=m
+PCH_CAN all=m
 #- file drivers/net/can/mscan/Kconfig goes here
 #- file drivers/net/can/sja1000/Kconfig goes here
 #- file drivers/net/can/usb/Kconfig goes here
@@ -2964,6 +2983,7 @@ CICADA_PHY all=m
 VITESSE_PHY all=m
 SMSC_PHY all=m
 BROADCOM_PHY all=m
+BCM63XX_PHY all=m
 ICPLUS_PHY all=m
 REALTEK_PHY all=m
 NATIONAL_PHY all=m
@@ -2980,6 +3000,13 @@ MDIO_GPIO all=m
 SFC all=m sparc=n
 SFC_MTD all=y
 
+#-
+#- *** FILE: drivers/net/stmmac/Kconfig ***
+#-
+STMMAC_ETH all=m
+STMMAC_DA all=y
+STMMAC_DUAL_MAC all=y
+
 #-
 #- *** FILE: drivers/net/tokenring/Kconfig ***
 #-
@@ -3041,6 +3068,7 @@ USB_ARMLINUX all=y
 USB_EPSON2888 all=y ppc=n ppc64=n
 USB_KC2190 all=y
 USB_NET_ZAURUS all=m
+USB_NET_CX82310_ETH all=m
 USB_HSO all=m
 USB_NET_INT51X1 all=m
 USB_CDC_PHONET all=m
@@ -3130,6 +3158,7 @@ MWL8K all=m
 #- file drivers/net/wireless/orinoco/Kconfig goes here
 #- file drivers/net/wireless/p54/Kconfig goes here
 #- file drivers/net/wireless/rt2x00/Kconfig goes here
+#- file drivers/net/wireless/wl1251/Kconfig goes here
 #- file drivers/net/wireless/wl12xx/Kconfig goes here
 #- file drivers/net/wireless/zd1211rw/Kconfig goes here
 
@@ -3141,6 +3170,7 @@ ATH_DEBUG all=n
 #- file drivers/net/wireless/ath/ath5k/Kconfig goes here
 #- file drivers/net/wireless/ath/ath9k/Kconfig goes here
 #- file drivers/net/wireless/ath/ar9170/Kconfig goes here
+#- file drivers/net/wireless/ath/carl9170/Kconfig goes here
 
 #-
 #- *** FILE: drivers/net/wireless/ath/ar9170/Kconfig ***
@@ -3158,9 +3188,16 @@ ATH5K_DEBUG all=n
 #-
 ATH9K all=m
 ATH9K_DEBUGFS all=n
+ATH9K_RATE_CONTROL all=y
 ATH9K_HTC all=m
 ATH9K_HTC_DEBUGFS all=y
 
+#-
+#- *** FILE: drivers/net/wireless/ath/carl9170/Kconfig ***
+#-
+CARL9170 all=m
+CARL9170_LEDS all=y
+
 #-
 #- *** FILE: drivers/net/wireless/b43/Kconfig ***
 #-
@@ -3208,6 +3245,7 @@ LIBIPW_DEBUG all=n
 #-
 IWLWIFI all=m
 IWLWIFI_DEBUG all=y
+IWLWIFI_DEBUG_EXPERIMENTAL_UCODE all=n
 IWLWIFI_DEVICE_TRACING all=n
 IWLAGN all=m
 IWL4965 all=y
@@ -3254,6 +3292,7 @@ P54_COMMON all=m
 P54_USB all=m
 P54_PCI all=m
 P54_SPI all=m
+P54_SPI_DEFAULT_EEPROM all=y
 
 #-
 #- *** FILE: drivers/net/wireless/rt2x00/Kconfig ***
@@ -3271,7 +3310,6 @@ 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
 
 #-
@@ -3281,12 +3319,16 @@ RTL8180 all=m
 RTL8187 all=m
 
 #-
-#- *** FILE: drivers/net/wireless/wl12xx/Kconfig ***
+#- *** FILE: drivers/net/wireless/wl1251/Kconfig ***
 #-
-WL12XX all=m
 WL1251 all=m
 WL1251_SPI all=m
 WL1251_SDIO all=m
+
+#-
+#- *** FILE: drivers/net/wireless/wl12xx/Kconfig ***
+#-
+WL12XX all=m
 WL1271 all=m
 WL1271_SPI all=m
 WL1271_SDIO all=m
@@ -3409,7 +3451,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
+IDEAPAD_LAPTOP all=m
 THINKPAD_ACPI i386=m x86_64=m
 THINKPAD_ACPI_ALSA_SUPPORT all=y
 THINKPAD_ACPI_DEBUGFACILITIES all=n
@@ -3417,6 +3459,7 @@ THINKPAD_ACPI_DEBUG i386=n x86_64=n
 THINKPAD_ACPI_UNSAFE_LEDS all=n
 THINKPAD_ACPI_VIDEO all=y
 THINKPAD_ACPI_HOTKEY_POLL all=y
+SENSORS_HDAPS all=m
 INTEL_MENLOW all=m
 EEEPC_LAPTOP all=m
 EEEPC_WMI all=m
@@ -3431,6 +3474,7 @@ INTEL_SCU_IPC i386=y
 GPIO_INTEL_PMIC i386=y
 RAR_REGISTER all=y
 INTEL_IPS all=m
+IBM_RTL all=m
 
 #-
 #- *** FILE: drivers/pnp/Kconfig ***
@@ -3466,17 +3510,20 @@ POWER_SUPPLY all=m i386=y ia64=y x86_64=y
 POWER_SUPPLY_DEBUG all=n
 PDA_POWER all=m
 APM_POWER ppc=m
+WM831X_BACKUP all=m
 WM831X_POWER all=m
 WM8350_POWER all=m
 TEST_POWER all=m
 BATTERY_DS2760 all=m
 BATTERY_DS2782 all=m
 BATTERY_PMU ppc=m
+BATTERY_BQ20Z75 all=m
 BATTERY_BQ27x00 all=m
 BATTERY_DA9030 all=m
 BATTERY_MAX17040 all=m
 CHARGER_PCF50633 all=m
 BATTERY_INTEL_MID all=m
+CHARGER_ISP1704 all=m
 
 #-
 #- *** FILE: drivers/pps/Kconfig ***
@@ -3505,6 +3552,7 @@ REGULATOR_BQ24022 all=m
 REGULATOR_MAX1586 all=m
 REGULATOR_MAX8649 all=m
 REGULATOR_MAX8660 all=m
+REGULATOR_MAX8952 all=m
 REGULATOR_TWL4030 powerpc=y
 REGULATOR_WM831X all=m
 REGULATOR_WM8350 all=m
@@ -3513,6 +3561,7 @@ REGULATOR_WM8994 all=m
 REGULATOR_DA903X all=m
 REGULATOR_PCF50633 all=m
 REGULATOR_LP3971 all=m
+REGULATOR_LP3972 all=m
 REGULATOR_PCAP all=m
 REGULATOR_MC13783 all=m
 REGULATOR_AB3100 all=m
@@ -3590,7 +3639,7 @@ RTC_DRV_AB8500 all=m
 RTC_DRV_GENERIC powerpc=y
 RTC_DRV_PS3 ppc64=m
 RTC_DRV_PCAP all=m
-RTC_DRV_MC13783 all=m
+RTC_DRV_MC13XXX all=m
 
 #-
 #- *** FILE: drivers/sbus/char/Kconfig ***
@@ -3636,7 +3685,7 @@ SCSI_SRP_ATTRS all=m
 SCSI_SRP_TGT_ATTRS all=y
 SCSI_LOWLEVEL all=y
 ISCSI_TCP all=m
-#- file drivers/scsi/cxgb3i/Kconfig goes here
+#- file drivers/scsi/cxgbi/Kconfig goes here
 #- file drivers/scsi/bnx2i/Kconfig goes here
 #- file drivers/scsi/be2iscsi/Kconfig goes here
 BLK_DEV_3W_XXXX_RAID all=m
@@ -3780,10 +3829,15 @@ BE2ISCSI all=m
 SCSI_BNX2_ISCSI all=m
 
 #-
-#- *** FILE: drivers/scsi/cxgb3i/Kconfig ***
+#- *** FILE: drivers/scsi/cxgbi/cxgb3i/Kconfig ***
 #-
 SCSI_CXGB3_ISCSI all=m
 
+#-
+#- *** FILE: drivers/scsi/cxgbi/cxgb4i/Kconfig ***
+#-
+SCSI_CXGB4_ISCSI all=m
+
 #-
 #- *** FILE: drivers/scsi/device_handler/Kconfig ***
 #-
@@ -3931,6 +3985,7 @@ SPI_BUTTERFLY all=m
 SPI_GPIO all=m
 SPI_LM70_LLP all=m
 SPI_MPC52xx_PSC ppc=m
+SPI_TOPCLIFF_PCH all=m
 SPI_XILINX all=m
 SPI_XILINX_PLTFM all=m
 SPI_DESIGNWARE all=y
@@ -3957,23 +4012,26 @@ STAGING_EXCLUDE_BUILD all=n
 #- file drivers/staging/go7007/Kconfig goes here
 #- file drivers/staging/cx25821/Kconfig goes here
 #- file drivers/staging/tm6000/Kconfig goes here
+#- file drivers/staging/cpia/Kconfig goes here
+#- file drivers/staging/stradis/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/otus/Kconfig goes here
+#- file drivers/staging/brcm80211/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/olpc_dcon/Kconfig goes here
 #- file drivers/staging/asus_oled/Kconfig goes here
 #- file drivers/staging/panel/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/rtl8712/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/autofs/Kconfig goes here
 #- file drivers/staging/phison/Kconfig goes here
 #- file drivers/staging/line6/Kconfig goes here
 #- file drivers/gpu/drm/vmwgfx/Kconfig goes here
@@ -4001,13 +4059,21 @@ STAGING_EXCLUDE_BUILD all=n
 #- 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/smbfs/Kconfig goes here
 #- file drivers/staging/easycap/Kconfig goes here
 #- file drivers/staging/solo6x10/Kconfig goes here
 #- file drivers/staging/tidspbridge/Kconfig goes here
 #- file drivers/staging/quickstart/Kconfig goes here
+#- file drivers/staging/westbridge/Kconfig goes here
+#- file drivers/staging/sbe-2t3e3/Kconfig goes here
+#- file drivers/staging/ath6kl/Kconfig goes here
+#- file drivers/staging/keucr/Kconfig goes here
+#- file drivers/staging/bcm/Kconfig goes here
+#- file drivers/staging/ft1000/Kconfig goes here
+#- file drivers/staging/intel_sst/Kconfig goes here
+#- file drivers/staging/speakup/Kconfig goes here
 
 #-
 #- *** FILE: drivers/staging/adis16255/Kconfig ***
@@ -4019,12 +4085,34 @@ ADIS16255 all=m
 #-
 ASUS_OLED all=m
 
+#-
+#- *** FILE: drivers/staging/ath6kl/Kconfig ***
+#-
+ATH6K_LEGACY all=n
+
+#-
+#- *** FILE: drivers/staging/autofs/Kconfig ***
+#-
+AUTOFS_FS all=m
+
 #-
 #- *** FILE: drivers/staging/batman-adv/Kconfig ***
 #-
 BATMAN_ADV all=m
 BATMAN_ADV_DEBUG all=n
 
+#-
+#- *** FILE: drivers/staging/bcm/Kconfig ***
+#-
+BCM_WIMAX all=m
+
+#-
+#- *** FILE: drivers/staging/brcm80211/Kconfig ***
+#-
+BRCM80211 all=m
+BRCM80211_PCI all=y
+BRCMFMAC all=n
+
 #-
 #- *** FILE: drivers/staging/comedi/Kconfig ***
 #-
@@ -4153,6 +4241,13 @@ COMEDI_MITE all=m
 COMEDI_NI_TIO all=m
 COMEDI_NI_LABPC all=m
 
+#-
+#- *** FILE: drivers/staging/cpia/Kconfig ***
+#-
+VIDEO_CPIA all=m sparc=n
+VIDEO_CPIA_PP all=m
+VIDEO_CPIA_USB all=m
+
 #-
 #- *** FILE: drivers/staging/crystalhd/Kconfig ***
 #-
@@ -4170,12 +4265,6 @@ VIDEO_CX25821_ALSA all=m
 CXT1E1 all=m
 SBE_PMCC4_NCOMM all=y
 
-#-
-#- *** FILE: drivers/staging/dream/Kconfig ***
-#-
-#- file drivers/staging/dream/camera/Kconfig goes here
-INPUT_GPIO all=m
-
 #-
 #- *** FILE: drivers/staging/dt3155v4l/Kconfig ***
 #-
@@ -4203,6 +4292,12 @@ ET131X_DEBUG all=n
 #-
 TRANZPORT all=m
 
+#-
+#- *** FILE: drivers/staging/ft1000/Kconfig ***
+#-
+FT1000 all=m
+FT1000_USB all=m
+
 #-
 #- *** FILE: drivers/staging/go7007/Kconfig ***
 #-
@@ -4258,6 +4353,8 @@ SCA3000 all=m
 #- Analog to digital convertors
 MAX1363 all=m
 MAX1363_RING_BUFFER all=y
+AD799X all=m
+AD7476 all=m
 
 #-
 #- *** FILE: drivers/staging/iio/gyro/Kconfig ***
@@ -4278,11 +4375,13 @@ ADIS16400 all=m
 #-
 #- Light sensors
 SENSORS_TSL2563 all=m
+SENSORS_ISL29018 all=m
 
 #-
 #- *** FILE: drivers/staging/iio/magnetometer/Kconfig ***
 #-
 #- Magnetometer sensors
+SENSORS_AK8975 all=m
 SENSORS_HMC5843 all=m
 
 #-
@@ -4292,6 +4391,11 @@ SENSORS_HMC5843 all=m
 IIO_PERIODIC_RTC_TRIGGER all=m
 IIO_GPIO_TRIGGER all=m
 
+#-
+#- *** FILE: drivers/staging/keucr/Kconfig ***
+#-
+USB_ENESTORAGE all=m
+
 #-
 #- *** FILE: drivers/staging/line6/Kconfig ***
 #-
@@ -4307,6 +4411,7 @@ LIRC_IGORPLUGUSB all=m
 LIRC_IMON all=m
 LIRC_IT87 all=m
 LIRC_ITE8709 all=m
+LIRC_PARALLEL all=m
 LIRC_SASEM all=m
 LIRC_SERIAL all=m
 LIRC_SERIAL_TRANSMITTER all=y
@@ -4319,16 +4424,6 @@ LIRC_ZILOG all=m
 #-
 MRST_RAR_HANDLER all=m
 
-#-
-#- *** FILE: drivers/staging/mrst-touchscreen/Kconfig ***
-#-
-TOUCHSCREEN_INTEL_MID all=m
-
-#-
-#- *** FILE: drivers/staging/otus/Kconfig ***
-#-
-OTUS all=m
-
 #-
 #- *** FILE: drivers/staging/panel/Kconfig ***
 #-
@@ -4380,20 +4475,26 @@ R8187SE all=m
 RTL8192E all=m
 
 #-
-#- *** FILE: drivers/staging/rtl8192su/Kconfig ***
+#- *** FILE: drivers/staging/rtl8192u/Kconfig ***
 #-
-RTL8192SU all=m
+RTL8192U all=m
 
 #-
-#- *** FILE: drivers/staging/rtl8192u/Kconfig ***
+#- *** FILE: drivers/staging/rtl8712/Kconfig ***
 #-
-RTL8192U all=m
+R8712U all=m
+R8712_AP all=y
 
 #-
 #- *** FILE: drivers/staging/samsung-laptop/Kconfig ***
 #-
 SAMSUNG_LAPTOP all=m
 
+#-
+#- *** FILE: drivers/staging/sbe-2t3e3/Kconfig ***
+#-
+SBE_2T3E3 all=m
+
 #-
 #- *** FILE: drivers/staging/serqt_usb2/Kconfig ***
 #-
@@ -4409,11 +4510,38 @@ SLICOSS all=m
 #-
 FB_SM7XX all=m
 
+#-
+#- *** FILE: drivers/staging/smbfs/Kconfig ***
+#-
+SMB_FS all=m
+SMB_NLS_DEFAULT all=y
+SMB_NLS_REMOTE all="iso8859-2"
+
 #-
 #- *** FILE: drivers/staging/solo6x10/Kconfig ***
 #-
 SOLO6X10 all=m
 
+#-
+#- *** FILE: drivers/staging/speakup/Kconfig ***
+#-
+SPEAKUP all=m
+SPEAKUP_SYNTH_ACNTSA all=m
+SPEAKUP_SYNTH_ACNTPC all=m
+SPEAKUP_SYNTH_APOLLO all=m
+SPEAKUP_SYNTH_AUDPTR all=m
+SPEAKUP_SYNTH_BNS all=m
+SPEAKUP_SYNTH_DECTLK all=m
+SPEAKUP_SYNTH_DECEXT all=m
+SPEAKUP_SYNTH_DECPC all=m
+SPEAKUP_SYNTH_DTLK all=m
+SPEAKUP_SYNTH_KEYPC all=m
+SPEAKUP_SYNTH_LTLK all=m
+SPEAKUP_SYNTH_SOFT all=m
+SPEAKUP_SYNTH_SPKOUT all=m
+SPEAKUP_SYNTH_TXPRT all=m
+SPEAKUP_SYNTH_DUMMY all=m
+
 #-
 #- *** FILE: drivers/staging/spectra/Kconfig ***
 #-
@@ -4422,10 +4550,14 @@ SPECTRA_MRST_HW all=n
 SPECTRA_MTD all=y
 SPECTRA_EMU all=n
 
+#-
+#- *** FILE: drivers/staging/stradis/Kconfig ***
+#-
+VIDEO_STRADIS all=m ppc=n sparc=n
+
 #-
 #- *** FILE: drivers/staging/ti-st/Kconfig ***
 #-
-TI_ST all=m
 ST_BT all=m
 
 #-
@@ -4514,7 +4646,6 @@ FB_XGI all=m
 #- *** FILE: drivers/staging/zram/Kconfig ***
 #-
 ZRAM all=m
-ZRAM_STATS all=y
 
 #-
 #- *** FILE: drivers/telephony/Kconfig ***
@@ -4716,6 +4847,7 @@ USB_TRANCEVIBRATOR all=m
 USB_IOWARRIOR all=m
 USB_TEST all=m
 USB_ISIGHTFW all=m
+USB_YUREX all=m
 
 #-
 #- *** FILE: drivers/usb/misc/sisusbvga/Kconfig ***
@@ -4734,6 +4866,7 @@ USB_MON all=m
 #- Enable Host or Gadget support to see Inventra options
 USB_MUSB_HDRC all=n
 #- DaVinci 35x and 644x USB support
+#- DA8xx/OMAP-L1x USB support
 #- OMAP 243x high speed USB support
 #- OMAP 343x high speed USB support
 #- OMAP 44xx high speed USB support
@@ -4802,6 +4935,7 @@ USB_SERIAL_SPCP8X5 all=m
 USB_SERIAL_HP4X all=m
 USB_SERIAL_SAFE all=m
 USB_SERIAL_SAFE_PADDED all=y
+USB_SERIAL_SAMBA all=m
 USB_SERIAL_SIEMENS_MPI all=m
 USB_SERIAL_SIERRAWIRELESS all=m
 USB_SERIAL_SYMBOL all=m
@@ -4834,6 +4968,7 @@ USB_STORAGE_ALAUDA all=m
 USB_STORAGE_ONETOUCH all=m
 USB_STORAGE_KARMA all=m
 USB_STORAGE_CYPRESS_ATACB all=m
+USB_UAS all=m
 USB_LIBUSUAL all=y
 
 #-
@@ -4848,9 +4983,7 @@ USB_WUSB_CBAF_DEBUG all=n
 #-
 UWB all=m
 UWB_WHCI sparc=m
-UWB_WLP all=m
 UWB_I1480U all=m
-UWB_I1480U_WLP all=m
 
 #-
 #- *** FILE: drivers/vhost/Kconfig ***
@@ -4863,6 +4996,7 @@ VHOST_NET all=m
 #- file drivers/char/agp/Kconfig goes here
 #- file drivers/gpu/vga/Kconfig goes here
 #- file drivers/gpu/drm/Kconfig goes here
+#- file drivers/gpu/stub/Kconfig goes here
 VGASTATE all=m
 VIDEO_OUTPUT_CONTROL all=m
 FB all=y
@@ -5088,6 +5222,7 @@ W1_SLAVE_SMEM all=m
 W1_SLAVE_DS2431 all=m
 W1_SLAVE_DS2433 all=m
 W1_SLAVE_DS2433_CRC all=y sparc=n
+W1_SLAVE_DS2760 all=m
 W1_SLAVE_BQ27000 all=m
 
 #-
@@ -5154,6 +5289,7 @@ USBPCWATCHDOG all=m
 #-
 9P_FS all=m
 9P_FSCACHE all=y
+9P_FS_POSIX_ACL all=y
 
 #-
 #- *** FILE: fs/Kconfig ***
@@ -5173,9 +5309,9 @@ FS_POSIX_ACL all=y
 #- file fs/ocfs2/Kconfig goes here
 #- file fs/btrfs/Kconfig goes here
 #- file fs/nilfs2/Kconfig goes here
+EXPORTFS all=m
 #- file fs/notify/Kconfig goes here
 #- file fs/quota/Kconfig goes here
-#- file fs/autofs/Kconfig goes here
 #- file fs/autofs4/Kconfig goes here
 #- file fs/fuse/Kconfig goes here
 CUSE all=m
@@ -5222,11 +5358,9 @@ NETWORK_FILESYSTEMS all=y
 #- file fs/nfsd/Kconfig goes here
 LOCKD all=m
 LOCKD_V4 all=y
-EXPORTFS all=m
 NFS_ACL_SUPPORT all=m
 NFS_COMMON all=y
 #- file net/sunrpc/Kconfig goes here
-#- file fs/smbfs/Kconfig goes here
 #- file fs/ceph/Kconfig goes here
 #- file fs/cifs/Kconfig goes here
 #- file fs/ncpfs/Kconfig goes here
@@ -5265,11 +5399,6 @@ AFS_FS all=m
 AFS_DEBUG all=n
 AFS_FSCACHE all=y
 
-#-
-#- *** FILE: fs/autofs/Kconfig ***
-#-
-AUTOFS_FS all=m
-
 #-
 #- *** FILE: fs/autofs4/Kconfig ***
 #-
@@ -5303,7 +5432,6 @@ CACHEFILES_HISTOGRAM all=n
 #- *** FILE: fs/ceph/Kconfig ***
 #-
 CEPH_FS all=m
-CEPH_FS_PRETTYDEBUG all=n
 
 #-
 #- *** FILE: fs/cifs/Kconfig ***
@@ -5317,6 +5445,7 @@ CIFS_POSIX all=y
 CIFS_DEBUG2 all=n
 CIFS_DFS_UPCALL all=n
 CIFS_FSCACHE all=y
+CIFS_ACL all=y
 CIFS_EXPERIMENTAL all=y
 
 #-
@@ -5514,11 +5643,13 @@ NFS_V4 all=y
 NFS_V4_1 all=n
 NFS_FSCACHE all=y
 NFS_USE_LEGACY_DNS all=n
+NFS_USE_NEW_IDMAPPER all=y
 
 #-
 #- *** FILE: fs/nfsd/Kconfig ***
 #-
 NFSD all=m
+NFSD_DEPRECATED all=n
 NFSD_V2_ACL all=y
 NFSD_V3 all=y
 NFSD_V3_ACL all=y
@@ -5578,6 +5709,11 @@ NLS_UTF8 all=m
 #-
 DNOTIFY all=y
 
+#-
+#- *** FILE: fs/notify/fanotify/Kconfig ***
+#-
+FANOTIFY all=y
+
 #-
 #- *** FILE: fs/notify/inotify/Kconfig ***
 #-
@@ -5673,13 +5809,6 @@ REISERFS_FS_SECURITY all=y
 ROMFS_FS all=y
 ROMFS_BACKED_BY_BLOCK all=y
 
-#-
-#- *** FILE: fs/smbfs/Kconfig ***
-#-
-SMB_FS all=m
-SMB_NLS_DEFAULT all=y
-SMB_NLS_REMOTE all="iso8859-2"
-
 #-
 #- *** FILE: fs/squashfs/Kconfig ***
 #-
@@ -5756,6 +5885,7 @@ TASK_XACCT all=y
 TASK_IO_ACCOUNTING all=y
 AUDIT all=y
 AUDITSYSCALL all=y
+#- file kernel/irq/Kconfig goes here
 TREE_RCU all=y
 RCU_TRACE all=n
 RCU_FANOUT all=32 alpha=64 ia64=64 ppc64=64 sparc64=64 x86_64=64
@@ -5775,19 +5905,21 @@ CGROUP_CPUACCT all=y
 RESOURCE_COUNTERS all=y
 CGROUP_MEM_RES_CTLR all=y
 CGROUP_MEM_RES_CTLR_SWAP all=y
+CGROUP_MEM_RES_CTLR_SWAP_ENABLED all=n
 CGROUP_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
 UTS_NS all=y
 IPC_NS all=y
 USER_NS all=y
 PID_NS all=y
 NET_NS all=y
+SYSFS_DEPRECATED all=n
+SYSFS_DEPRECATED_V2 all=n
+RELAY all=y
 BLK_DEV_INITRD all=y
 #- file usr/Kconfig goes here
 CC_OPTIMIZE_FOR_SIZE all=n
@@ -5865,9 +5997,6 @@ SUSPEND all=y
 SUSPEND_FREEZER ppc=y ppc64=y
 HIBERNATION all=y
 PM_STD_PARTITION all=""
-#- Image Storage (you need at least one allocator)
-#- General Options
-#- No compression support available without Cryptoapi support.
 APM_EMULATION ppc=m
 PM_RUNTIME all=y
 
@@ -5958,8 +6087,10 @@ DEBUG_RT_MUTEXES all=n
 RT_MUTEX_TESTER all=n
 DEBUG_SPINLOCK all=n
 DEBUG_MUTEXES all=y ia64=n
+BKL all=y
 DEBUG_LOCK_ALLOC all=n
 PROVE_LOCKING all=n
+SPARSE_RCU_POINTER all=n
 LOCK_STAT all=n
 DEBUG_SPINLOCK_SLEEP all=n
 DEBUG_LOCKING_API_SELFTESTS all=n
@@ -5995,6 +6126,7 @@ BUILD_DOCSRC all=n
 DYNAMIC_DEBUG all=n
 DMA_API_DEBUG all=n
 ATOMIC64_SELFTEST all=n
+ASYNC_RAID6_TEST all=m
 #- file samples/Kconfig goes here
 #- file lib/Kconfig.kgdb goes here
 #- file lib/Kconfig.kmemcheck goes here
@@ -6116,6 +6248,7 @@ WIRELESS all=y
 #- file net/rfkill/Kconfig goes here
 #- file net/9p/Kconfig goes here
 #- file net/caif/Kconfig goes here
+#- file net/ceph/Kconfig goes here
 
 #-
 #- *** FILE: net/atm/Kconfig ***
@@ -6200,6 +6333,12 @@ CAN_RAW all=m
 CAN_BCM all=m
 #- file drivers/net/can/Kconfig goes here
 
+#-
+#- *** FILE: net/ceph/Kconfig ***
+#-
+CEPH_LIB all=m
+CEPH_LIB_PRETTYDEBUG all=n
+
 #-
 #- *** FILE: net/dcb/Kconfig ***
 #-
@@ -6220,7 +6359,6 @@ NET_DCCPPROBE all=m
 IP_DCCP_CCID2_DEBUG all=n
 IP_DCCP_CCID3 all=y
 IP_DCCP_CCID3_DEBUG all=n
-IP_DCCP_CCID3_RTO all=100
 IP_DCCP_TFRC_LIB all=y
 
 #-
@@ -6264,6 +6402,7 @@ IP_PNP_DHCP all=y
 IP_PNP_BOOTP all=y
 IP_PNP_RARP all=y
 NET_IPIP all=m
+NET_IPGRE_DEMUX all=m
 NET_IPGRE all=m
 NET_IPGRE_BROADCAST all=y
 IP_MROUTE all=y
@@ -6450,6 +6589,7 @@ IP_VS_SH all=m
 IP_VS_SED all=m
 IP_VS_NQ all=m
 IP_VS_FTP all=m
+IP_VS_PE_SIP all=m
 
 #-
 #- *** FILE: net/netlabel/Kconfig ***
@@ -6465,6 +6605,7 @@ PACKET all=y
 #- *** FILE: net/phonet/Kconfig ***
 #-
 PHONET all=m
+PHONET_PIPECTRLR all=y
 
 #-
 #- *** FILE: net/rds/Kconfig ***
@@ -6538,6 +6679,7 @@ NET_ACT_NAT all=m
 NET_ACT_PEDIT all=m
 NET_ACT_SIMP all=m
 NET_ACT_SKBEDIT all=m
+NET_ACT_CSUM all=m
 NET_CLS_IND all=y
 NET_SCH_FIFO all=y
 
@@ -6559,7 +6701,6 @@ SUNRPC all=m
 SUNRPC_GSS all=m
 SUNRPC_XPRT_RDMA all=m
 RPCSEC_GSS_KRB5 all=m
-RPCSEC_GSS_SPKM3 all=m
 
 #-
 #- *** FILE: net/tipc/Kconfig ***
@@ -6623,9 +6764,9 @@ SAMPLES all=n
 #-
 #- *** FILE: security/Kconfig ***
 #-
-#- file grsecurity/Kconfig goes here
 KEYS all=y
 KEYS_DEBUG_PROC_KEYS all=n
+SECURITY_DMESG_RESTRICT all=y
 SECURITY all=y
 SECURITY_NETWORK all=y
 SECURITY_NETWORK_XFRM all=y
@@ -6808,7 +6949,6 @@ SND_SB8 alpha=m i386=m
 SND_SB16 alpha=m i386=m
 SND_SBAWE alpha=m i386=m
 SND_SB16_CSP alpha=y i386=y
-SND_SGALAXY alpha=m i386=m
 SND_SSCAPE alpha=m i386=m
 SND_WAVEFRONT alpha=m i386=m
 SND_MSND_PINNACLE i386=m
@@ -6938,9 +7078,6 @@ SND_HDA_CODEC_REALTEK all=y
 SND_HDA_CODEC_ANALOG all=y
 SND_HDA_CODEC_SIGMATEL all=y
 SND_HDA_CODEC_VIA all=y
-SND_HDA_CODEC_ATIHDMI all=y
-SND_HDA_CODEC_NVHDMI all=y
-SND_HDA_CODEC_INTELHDMI all=y
 SND_HDA_CODEC_CIRRUS all=y
 SND_HDA_CODEC_CONEXANT all=y
 SND_HDA_CODEC_CA0110 all=y
@@ -7040,6 +7177,7 @@ INITRAMFS_COMPRESSION_LZMA all=n
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
 AB4500_CORE all=m
+ACPI_SYSFS_POWER ia64=y x86=y
 ALTERA_PCIE_CHDMA all=m
 ANDROID all=n
 ANDROID_BINDER_IPC all=n
@@ -7053,6 +7191,7 @@ B3DFG all=m
 BATMAN_DEBUG all=n
 BOOT_TRACER all=n
 BT_L2CAP_EXT_FEATURES all=y
+CEPH_FS_PRETTYDEBUG all=n
 CRYPTO_MANAGER_TESTS all=y
 DEBUG_CFQ_IOSCHED all=n
 DEFAULT_AS all=n
@@ -7060,6 +7199,7 @@ DETECT_SOFTLOCKUP all=y
 DST all=m
 DST_DEBUG all=n
 DT3155 all=m
+DVB_LGDT3304 all=m
 DX_SEP all=m
 ESPSERIAL alpha=m i386=m
 EVENT_PROFILE all=y
@@ -7070,15 +7210,30 @@ GROUP_SCHED all=y
 HW_BRANCH_TRACER all=n
 I2C_DEBUG_CHIP all=n
 I2C_VOODOO3 all=m
+IDEAPAD_ACPI all=m
+IEEE1394 all=m sparc=n
+IEEE1394_DV1394 all=m sparc=
+IEEE1394_ETH1394 all=m sparc=
+IEEE1394_ETH1394_ROM_ENTRY all=y sparc=
+IEEE1394_OHCI1394 all=m sparc=
+IEEE1394_PCILYNX all=m sparc=
+IEEE1394_RAWIO all=m sparc=
+IEEE1394_SBP2 all=m sparc=
+IEEE1394_SBP2_PHYS_DMA all=n
+IEEE1394_VERBOSEDEBUG all=n sparc=
+IEEE1394_VIDEO1394 all=m sparc=
 INOTIFY all=y
+INPUT_GPIO all=m
 INPUT_MIMIO all=m
 IOSCHED_AS all=y
+IP_DCCP_CCID3_RTO all=100
 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
+OTUS all=m
 OUCHSCREEN_AD7879_SPI all=m
 PACKET_MMAP all=y
 PCI_LEGACY all=y
@@ -7091,8 +7246,11 @@ POWER_TRACER all=n
 QT2160 all=m
 RAMZSWAP all=m
 RAMZSWAP_STATS all=y
+RPCSEC_GSS_SPKM3 all=m
 RT3090 all=m
+RTC_DRV_MC13783 all=m
 RTL8187SE all=m
+RTL8192SU all=m
 SECURITY_APPARMOR_DISABLE=n
 SECURITY_APPARMOR_NETWORK=y
 SECURITY_FILE_CAPABILITIES all=y
@@ -7100,6 +7258,10 @@ SENSORS_ADT7473 all=m
 SLOW_WORK_DEBUG all=n
 SND_DT019X alpha=m i386=m
 SND_ES968 alpha=m i386=m
+SND_HDA_CODEC_ATIHDMI all=y
+SND_HDA_CODEC_INTELHDMI all=y
+SND_HDA_CODEC_NVHDMI all=y
+SND_SGALAXY alpha=m i386=m
 SOUND_SSCAPE all=m
 SQUASHFS_XATTRS all=y
 STRIP all=m
@@ -7115,9 +7277,14 @@ USB_VST all=m
 USB_W9968CF all=m
 USB_ZC0301 all=m
 USER_SCHED all=n
+UWB_I1480U_WLP all=m
+UWB_WLP all=m
 VIDEO_OVCAMCHIP all=m
+VIDEO_SAA5246A all=m
+VIDEO_SAA5249 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
+ZRAM_STATS all=y

diff --git a/kernel-x86.config b/kernel-x86.config
index 2f0fe5abb32afb27583beaa372b9094e8e857862..4fb0116de5b5c289d818d464fd230448960d01b8 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -5,6 +5,7 @@
 OPROFILE x86=m
 OPROFILE_EVENT_MULTIPLEX x86=y
 KPROBES x86=y
+JUMP_LABEL x86=y
 #- file kernel/gcov/Kconfig goes here
 
 #-
@@ -15,7 +16,6 @@ KPROBES x86=y
 #- file kernel/Kconfig.freezer goes here
 #- file kernel/time/Kconfig goes here
 SMP x86=y
-SPARSE_IRQ i386=y x86_64=y
 X86_MPPARSE i386=y x86_64=n
 X86_BIGSMP i386=y
 X86_EXTENDED_PLATFORM i386=y x86_64=y
@@ -32,7 +32,6 @@ X86_ES7000 i386=n
 SCHED_OMIT_FRAME_POINTER i386=y x86_64=y
 PARAVIRT_GUEST x86=n
 #- file arch/x86/xen/Kconfig goes here
-VMI i386=y
 #- file arch/x86/lguest/Kconfig goes here
 PARAVIRT i386=y
 NO_BOOTMEM all=y
@@ -47,6 +46,7 @@ MAXSMP i386=n x86_64=n
 NR_CPUS x86=32
 SCHED_SMT x86=y
 SCHED_MC x86=y
+IRQ_TIME_ACCOUNTING all=n
 #- file kernel/Kconfig.preempt goes here
 X86_UP_APIC i386=y
 X86_UP_IOAPIC i386=y
@@ -80,7 +80,7 @@ NODES_SHIFT x86_64=6
 HIGHPTE i386=n
 X86_CHECK_BIOS_CORRUPTION x86=y
 X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK x86=y
-X86_RESERVE_LOW_64K x86=y
+X86_RESERVE_LOW all=64
 MATH_EMULATION i386=y i686=n pentium3=n pentium4=n athlon=n
 MTRR x86=y
 MTRR_SANITIZER x86=y
@@ -139,7 +139,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
@@ -193,7 +192,6 @@ X86_PTDUMP x86=n
 DEBUG_RODATA x86=y
 DEBUG_RODATA_TEST x86=n
 DEBUG_NX_TEST x86=m
-4KSTACKS i386=n
 IOMMU_DEBUG x86_64=n
 IOMMU_STRESS x86=n
 X86_DECODER_SELFTEST all=n
@@ -245,9 +243,17 @@ KVM_AMD x86=m
 #-
 XEN i386=n
 
+#-
+#- *** FILE: kernel/irq/Kconfig ***
+#-
+SPARSE_IRQ i386=y x86_64=y
+
 #-
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
+4KSTACKS i386=n
 OPROFILE_IBS x86=n
+VMI i386=y
 X86_CPU_DEBUG x86=m
 X86_PTRACE_BTS i386=y x86_64=y
+X86_RESERVE_LOW_64K x86=y