- updated

Changed files:
    kernel-multiarch.config -> 1.39
    kernel-x86.config -> 1.24

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 4fe0676756ed67b2626a00a2699f9ee1f8e22cfd..0b5cbd9b391b496e2b42273901613ab3bedc6329 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -3,6 +3,7 @@
 #- *** FILE: arch/* - ARCH SPECIFIC OPTIONS ***
 #-
 DEBUG_STRICT_USER_COPY_CHECKS all=n
+OPTPROBES all=y
 
 #-
 #- *** FILE: block/Kconfig ***
@@ -40,6 +41,7 @@ CRYPTO_HASH all=y
 CRYPTO_MANAGER 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
@@ -195,7 +197,7 @@ PATA_ISAPNP alpha=m i386=m
 PATA_IT821X all=m sparc=n
 PATA_IT8213 all=m
 PATA_JMICRON all=m sparc=n
-PATA_LEGACY alpha=m i386=m
+PATA_LEGACY all=m
 PATA_TRIFLEX all=m sparc=n
 PATA_MARVELL all=m sparc=n
 PATA_MPC52xx ppc=m
@@ -517,11 +519,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,6 +564,7 @@ CRYPTO_DEV_TALITOS all=m
 #- *** FILE: drivers/dma/Kconfig ***
 #-
 DMADEVICES all=y
+DMADEVICES_DEBUG all=n
 #- DMA Devices
 INTEL_IOATDMA i386=m x86_64=m
 FSL_DMA ppc=y ppc64=y
@@ -643,18 +641,23 @@ 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
 #- SPI GPIO expanders:
 GPIO_MAX7301 all=m
 GPIO_MCP23S08 all=m
@@ -697,6 +700,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,13 +713,21 @@ HID_SUPPORT all=y
 HID all=m
 HIDRAW all=y
 #- file drivers/hid/usbhid/Kconfig goes here
+HID_3M_PCT all=m
 DRAGONRISE_FF all=y
 LOGITECH_FF all=y
 LOGIRUMBLEPAD2_FF all=y
+LOGIG940_FF all=y
+HID_MAGICMOUSE all=m
+HID_MOSART all=m
+HID_NTRIG all=m
 PANTHERLORD_FF all=y
+HID_QUANTA all=m
+HID_STANTUM all=m
 GREENASIA_FF all=y
 SMARTJOYPLUS_FF all=y
 THRUSTMASTER_FF all=y
+HID_WACOM all=m
 ZEROPLUS_FF all=y
 
 #-
@@ -742,10 +759,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
@@ -833,11 +851,9 @@ I2C_CHARDEV all=m
 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 ***
@@ -879,6 +895,7 @@ I2C_MPC ppc=n
 I2C_OCORES all=m
 I2C_PASEMI ppc64=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
@@ -894,11 +911,6 @@ SCx200_I2C_SCL i386=12
 SCx200_I2C_SDA i386=13
 SCx200_ACB i386=m
 
-#-
-#- *** FILE: drivers/i2c/chips/Kconfig ***
-#-
-SENSORS_TSL2550 all=m
-
 #-
 #- *** FILE: drivers/ide/Kconfig ***
 #-
@@ -1285,12 +1297,13 @@ TOUCHSCREEN_PCAP all=m
 #-
 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 +1402,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 ***
@@ -1440,8 +1452,9 @@ 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_TRIGGERS all=y
+#- LED Triggers
 LEDS_TRIGGER_TIMER all=m
 LEDS_TRIGGER_IDE_DISK all=y
 LEDS_TRIGGER_HEARTBEAT all=m
@@ -1576,6 +1589,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 +1645,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 +1719,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 +1788,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 ***
@@ -1866,6 +1889,7 @@ 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
@@ -1902,6 +1926,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 +1973,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,9 +1983,11 @@ 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
@@ -2037,6 +2066,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 ***
 #-
@@ -2135,6 +2169,7 @@ PMIC_DA903X powerpc=y
 MFD_WM8400 all=m
 MFD_WM831X all=m
 MFD_WM8350_I2C all=m
+MFD_WM8994 all=m
 MFD_PCF50633 all=m
 MFD_MC13783 all=m
 PCF50633_ADC all=m
@@ -2143,6 +2178,8 @@ AB3100_CORE all=m
 AB3100_OTP all=m
 EZX_PCAP all=y
 AB4500_CORE all=m
+MFD_TIMBERDALE all=m
+LPC_SCH all=m
 
 #-
 #- *** FILE: drivers/misc/Kconfig ***
@@ -2158,12 +2195,15 @@ 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
 DS1682 all=m
 TI_DAC7512 all=m
+VMWARE_BALLOON 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 +2266,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
@@ -2415,6 +2455,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,6 +2526,7 @@ 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
@@ -2555,7 +2597,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 +2609,12 @@ NETDEV_10000 all=y
 CHELSIO_T1 all=m sparc=n
 CHELSIO_T1_1G all=y
 CHELSIO_T3 all=m
+CHELSIO_T4 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 +2628,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
@@ -2683,6 +2727,7 @@ 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 ***
@@ -2781,6 +2826,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 +2883,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 +2901,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 ***
@@ -3013,14 +3062,12 @@ 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 ***
@@ -3037,6 +3084,7 @@ 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 ***
@@ -3067,9 +3115,14 @@ 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
 
@@ -3117,7 +3170,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
@@ -3210,6 +3262,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
@@ -3267,22 +3320,33 @@ CHARGER_PCF50633 all=m
 #-
 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
@@ -3640,7 +3704,7 @@ SERIAL_8250_RSA all=y
 SERIAL_8250_MCA i386=m
 #- Non-8250 serial port support
 SERIAL_MAX3100 all=m
-SERIAL_UARTLITE ppc=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 +3729,7 @@ 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
 
 #-
 #- *** FILE: drivers/sfi/Kconfig ***
@@ -3724,18 +3789,14 @@ STAGING_EXCLUDE_BUILD all=n
 #- 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
@@ -3747,7 +3808,7 @@ STAGING_EXCLUDE_BUILD all=n
 #- 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/rar_register/Kconfig goes here
 #- file drivers/staging/sep/Kconfig goes here
 #- file drivers/staging/iio/Kconfig goes here
 #- file drivers/staging/ramzswap/Kconfig goes here
@@ -3760,11 +3821,8 @@ STAGING_EXCLUDE_BUILD all=n
 #- file drivers/staging/wavelan/Kconfig goes here
 #- file drivers/staging/netwave/Kconfig goes here
 #- file drivers/staging/sm7xx/Kconfig goes here
-
-#-
-#- *** FILE: drivers/staging/altpciechdma/Kconfig ***
-#-
-ALTERA_PCIE_CHDMA all=m
+#- file drivers/staging/dt3155/Kconfig goes here
+#- file drivers/staging/crystalhd/Kconfig goes here
 
 #-
 #- *** FILE: drivers/staging/arlan/Kconfig ***
@@ -3776,16 +3834,11 @@ ARLAN i386=m
 #-
 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 ***
@@ -3796,6 +3849,11 @@ COMEDI_PCI_DRIVERS all=m
 COMEDI_PCMCIA_DRIVERS all=m
 COMEDI_USB_DRIVERS all=m
 
+#-
+#- *** FILE: drivers/staging/crystalhd/Kconfig ***
+#-
+CRYSTALHD all=m
+
 #-
 #- *** FILE: drivers/staging/cx25821/Kconfig ***
 #-
@@ -3809,6 +3867,11 @@ VIDEO_CX25821_ALSA all=m
 #- file drivers/staging/dream/camera/Kconfig goes here
 INPUT_GPIO all=m
 
+#-
+#- *** FILE: drivers/staging/dt3155/Kconfig ***
+#-
+DT3155 all=m
+
 #-
 #- *** FILE: drivers/staging/echo/Kconfig ***
 #-
@@ -3892,11 +3955,6 @@ IIO_GPIO_TRIGGER all=m
 #-
 LINE6_USB all=m
 
-#-
-#- *** FILE: drivers/staging/mimio/Kconfig ***
-#-
-INPUT_MIMIO all=m
-
 #-
 #- *** FILE: drivers/staging/netwave/Kconfig ***
 #-
@@ -3907,11 +3965,6 @@ PCMCIA_NETWAVE all=m
 #-
 OTUS all=m
 
-#-
-#- *** FILE: drivers/staging/p9auth/Kconfig ***
-#-
-PLAN9AUTH all=m
-
 #-
 #- *** FILE: drivers/staging/panel/Kconfig ***
 #-
@@ -3949,7 +4002,7 @@ RAMZSWAP all=m
 RAMZSWAP_STATS all=y
 
 #-
-#- *** FILE: drivers/staging/rar/Kconfig ***
+#- *** FILE: drivers/staging/rar_register/Kconfig ***
 #-
 RAR_REGISTER all=m
 
@@ -4007,7 +4060,6 @@ SLICOSS all=m
 #- *** FILE: drivers/staging/sm7xx/Kconfig ***
 #-
 FB_SM7XX all=m
-FB_SM7XX_ACCEL all=y
 
 #-
 #- *** FILE: drivers/staging/strip/Kconfig ***
@@ -4025,6 +4077,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 +4085,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 ***
@@ -4091,10 +4151,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 ***
@@ -4193,6 +4253,7 @@ 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
@@ -4250,7 +4311,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 +4323,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 ***
@@ -4342,6 +4401,7 @@ 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 +4416,7 @@ 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_DEBUG all=m
 
 #-
@@ -4394,6 +4455,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 ***
 #-
@@ -4527,6 +4593,7 @@ 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
@@ -4735,6 +4802,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
@@ -4756,6 +4824,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 +4896,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 ***
 #-
@@ -5002,6 +5077,11 @@ JFS_SECURITY all=y
 JFS_DEBUG all=n
 JFS_STATISTICS all=y
 
+#-
+#- *** FILE: fs/logfs/Kconfig ***
+#-
+LOGFS all=m
+
 #-
 #- *** FILE: fs/minix/Kconfig ***
 #-
@@ -5168,6 +5248,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
@@ -5268,14 +5349,10 @@ 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
@@ -5287,6 +5364,9 @@ 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
 SYSFS_DEPRECATED_V2 all=n
 RELAY all=y
 NAMESPACES all=y
@@ -5318,7 +5398,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
@@ -5403,7 +5482,6 @@ 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
@@ -5415,6 +5493,11 @@ 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 ***
 #-
@@ -5683,6 +5766,7 @@ BT_RFCOMM_TTY all=y
 #- *** FILE: net/bridge/Kconfig ***
 #-
 BRIDGE all=m
+BRIDGE_IGMP_SNOOPING all=y
 
 #-
 #- *** FILE: net/bridge/netfilter/Kconfig ***
@@ -5890,7 +5974,9 @@ MAC80211_DEBUG_MENU all=n
 #-
 #- *** FILE: net/netfilter/Kconfig ***
 #-
+NF_CONNTRACK_ZONES all=y
 NF_CT_PROTO_DCCP=m
+NETFILTER_XT_TARGET_CT all=m
 NETFILTER_XT_TARGET_RATEEST all=m
 NETFILTER_XT_TARGET_TCPOPTSTRIP all=m
 NETFILTER_XT_MATCH_IPRANGE all=m
@@ -5912,6 +5998,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 +6021,6 @@ NETLABEL all=y
 #- *** FILE: net/packet/Kconfig ***
 #-
 PACKET all=y
-PACKET_MMAP all=y
 
 #-
 #- *** FILE: net/phonet/Kconfig ***
@@ -6068,7 +6154,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
@@ -6108,7 +6193,6 @@ 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
@@ -6256,7 +6340,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
@@ -6478,6 +6561,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,6 +6582,7 @@ INITRAMFS_COMPRESSION_LZMA all=n
 #-
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
+ALTERA_PCIE_CHDMA all=m
 ANDROID all=n
 ANDROID_BINDER_IPC all=n
 ANDROID_LOGGER all=n
@@ -6505,18 +6590,39 @@ ANDROID_LOW_MEMORY_KILLER all=n
 ANDROID_RAM_CONSOLE all=n
 ANDROID_TIMED_GPIO all=n
 ATH9K_DEBUG all=n
+B3DFG all=m
+BATMAN_DEBUG 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
+GELIC_WIRELESS_OLD_PSK_INTERFACE ppc64=n
+GROUP_SCHED all=y
+I2C_DEBUG_CHIP all=n
 I2C_VOODOO3 all=m
+INPUT_MIMIO all=m
 IOSCHED_AS all=y
+IWL3945_SPECTRUM_MEASUREMENT all=y
 IWLWIFI_LEDS all=y
+IWLWIFI_SPECTRUM_MEASUREMENT all=y
 OCFS2_FS_POSIX_ACL all=n
+PACKET_MMAP all=y
+PCI_LEGACY all=y
+PLAN9AUTH all=m
+POWER_TRACER all=n
 RT3090 all=m
 RTL8187SE all=m
 SECURITY_FILE_CAPABILITIES all=y
+SENSORS_ADT7473 all=m
+SND_DT019X alpha=m i386=m
 SOUND_SSCAPE all=m
 TSL2561 all=m
+UIO_SMX all=m
+USB_BERRY_CHARGE all=m
+USB_VST all=m
+USER_SCHED all=n
+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 1feb755128ec5b2b85e2669b6dabaa543f434728..9cebe54c66c89444bc55c6d4271e54d88ef9180c 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -3,7 +3,6 @@
 #- *** FILE: arch/Kconfig ***
 #-
 OPROFILE x86=m
-OPROFILE_IBS x86=n
 OPROFILE_EVENT_MULTIPLEX x86=y
 KPROBES x86=y
 #- file kernel/gcov/Kconfig goes here
@@ -36,6 +35,7 @@ PARAVIRT_GUEST x86=n
 VMI i386=y
 #- file arch/x86/lguest/Kconfig goes here
 PARAVIRT i386=y
+NO_BOOTMEM all=y
 MEMTEST x86=n
 #- file arch/x86/Kconfig.cpu goes here
 HPET_TIMER x86=y
@@ -210,6 +210,7 @@ OPTIMIZE_INLINING x86=n
 #-
 #- file drivers/cpufreq/Kconfig goes here
 #- CPUFreq processor drivers
+X86_PCC_CPUFREQ x86=m x86_64=m
 X86_ACPI_CPUFREQ x86=m
 X86_POWERNOW_K6 i386=m
 X86_POWERNOW_K7 i386=m
@@ -235,6 +236,7 @@ VIRTUALIZATION x86=y
 KVM x86=m
 KVM_INTEL x86=m
 KVM_AMD x86=m
+#- file drivers/vhost/Kconfig goes here
 #- file drivers/lguest/Kconfig goes here
 #- file drivers/virtio/Kconfig goes here
 
@@ -246,4 +248,5 @@ XEN i386=n
 #-
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
+OPROFILE_IBS x86=n
 X86_CPU_DEBUG x86=m