- updated for 2.6.32

Changed files:
    kernel-multiarch.config -> 1.22
    kernel-x86.config -> 1.17

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 2c74bdd9f97b0786ea064da2a1738b133e7bb243..29419bf67df32b5f090cbc1cd60c6522b1089f32 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -5,6 +5,7 @@
 DEBUG_RODATA all=y
 DEBUG_RODATA_TEST all=n
 IOMMU_STRESS all=n
+OPROFILE_EVENT_MULTIPLEX all=n
 X86_MCE_INJECT all=m
 
 #-
@@ -61,9 +62,11 @@ CRYPTO_XTS all=m
 #- Hash modes
 CRYPTO_HMAC all=y
 CRYPTO_XCBC all=m
+CRYPTO_VMAC all=m
 #- Digest
 CRYPTO_CRC32C all=m
 CRYPTO_CRC32C_INTEL all=m
+CRYPTO_GHASH all=m
 CRYPTO_MD4 all=m
 CRYPTO_MD5 all=y
 CRYPTO_MICHAEL_MIC all=m
@@ -121,6 +124,7 @@ ACPI all=y
 ACPI_SLEEP i386=y x86_64=y
 ACPI_PROCFS all=y
 ACPI_PROCFS_POWER i386=y ia64=y x86_64=y
+ACPI_POWER_METER all=m
 ACPI_SYSFS_POWER i386=y ia64=y x86_64=y
 ACPI_PROC_EVENT all=y
 ACPI_AC i386=m x86_64=m
@@ -131,6 +135,7 @@ ACPI_FAN all=m
 ACPI_DOCK all=y
 ACPI_PROCESSOR all=m
 ACPI_HOTPLUG_CPU all=y
+ACPI_PROCESSOR_AGGREGATOR all=m
 ACPI_THERMAL all=m
 ACPI_NUMA ia64=y x86_64=y
 ACPI_CUSTOM_DSDT_FILE all=""
@@ -148,6 +153,7 @@ ACPI_SBS i386=m x86_64=m
 #-
 ATA all=m
 ATA_NONSTANDARD all=n ia64=y ppc64=y
+ATA_VERBOSE_ERROR all=y
 ATA_ACPI all=y
 SATA_PMP all=y sparc=n
 SATA_AHCI all=m sparc=n
@@ -172,6 +178,7 @@ PATA_ACPI i386=m ia64=m x86_64=m
 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_CMD64X all=m sparc=n
@@ -207,6 +214,7 @@ PATA_PCMCIA all=m
 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_SERVERWORKS all=m sparc=n
@@ -269,6 +277,7 @@ CFAG12864B_RATE i386=20 x86_64=20
 #- *** FILE: drivers/base/Kconfig ***
 #-
 UEVENT_HELPER_PATH all="/sbin/hotplug"
+DEVTMPFS all=n
 STANDALONE all=n
 PREVENT_FIRMWARE_BUILD all=y
 FIRMWARE_IN_KERNEL all=n
@@ -355,6 +364,8 @@ BT_HCIBT3C all=m
 BT_HCIBLUECARD all=m
 BT_HCIBTUART all=m
 BT_HCIVHCI all=m
+BT_MRVL all=m
+BT_MRVL_SDIO all=m
 
 #-
 #- *** FILE: drivers/char/Kconfig ***
@@ -557,6 +568,7 @@ DMATEST all=n
 EDAC all=y
 #- Reporting subsystems
 EDAC_DEBUG all=n
+EDAC_DECODE_MCE all=m
 EDAC_MM_EDAC all=m
 EDAC_AMD64 x86_64=m
 EDAC_AMD64_ERROR_INJECTION x86_64=y
@@ -566,6 +578,7 @@ EDAC_E752X i386=m x86_64=m
 EDAC_I82875P i386=m
 EDAC_I82975X i386=m x86_64=m
 EDAC_I3000 i386=m x86_64=m
+EDAC_I3200 all=m
 EDAC_X38 i386=m x86_64=m
 EDAC_I5400 all=m
 EDAC_I82860 i386=m
@@ -619,12 +632,16 @@ GPIO_MAX732X all=m
 GPIO_PCA953X all=m
 GPIO_PCF857X all=m
 GPIO_TWL4030 powerpc=m
+GPIO_WM831X all=m
 #- PCI GPIO expanders:
 GPIO_BT8XX all=m
+GPIO_LANGWELL all=n
 #- SPI GPIO expanders:
 GPIO_MAX7301 all=m
 GPIO_MCP23S08 all=m
+GPIO_MC33880 all=m
 #- AC97 GPIO expanders:
+GPIO_UCB1400 all=y
 
 #-
 #- *** FILE: drivers/gpu/drm/Kconfig ***
@@ -745,6 +762,7 @@ SENSORS_SMSC47B397 all=m
 SENSORS_ADS7828 all=m
 SENSORS_THMC50 all=m
 SENSORS_TMP401 all=m
+SENSORS_TMP421 all=m
 SENSORS_VIA686A all=m
 SENSORS_VT1211 all=m
 SENSORS_VT8231 all=m
@@ -756,6 +774,8 @@ SENSORS_W83L785TS all=m
 SENSORS_W83L786NG all=m
 SENSORS_W83627HF all=m
 SENSORS_W83627EHF all=m
+SENSORS_WM831X all=m
+SENSORS_WM8350 all=m
 SENSORS_HDAPS all=m
 SENSORS_LIS3_SPI ppc=m
 SENSORS_APPLESMC all=m
@@ -768,6 +788,7 @@ SENSORS_LIS3LV02D all=m
 #-
 I2C all=m ppc=y ppc64=y
 I2C_BOARDINFO all=y
+I2C_COMPAT all=y
 I2C_CHARDEV all=m
 I2C_HELPER_AUTO all=y
 #- file drivers/i2c/algos/Kconfig goes here
@@ -807,6 +828,7 @@ I2C_SIS96X all=m
 I2C_VIA all=m sparc=n
 I2C_VIAPRO all=m
 #- ACPI drivers
+I2C_SCMI all=m
 #- Mac SMBus host controller drivers
 I2C_HYDRA ppc=m
 I2C_POWERMAC ppc=m ppc64=m
@@ -1088,12 +1110,16 @@ JOYSTICK_IFORCE_232 all=y
 #- *** FILE: drivers/input/keyboard/Kconfig ***
 #-
 INPUT_KEYBOARD all=y
+KEYBOARD_ADP5588 all=m 
 KEYBOARD_ATKBD all=y sparc=m sparc64=m
+QT2160 all=m
 KEYBOARD_LKKBD all=m
 KEYBOARD_GPIO all=m
 KEYBOARD_MATRIX all=m
 KEYBOARD_LM8323 all=m
+KEYBOARD_MAX7359 all=m
 KEYBOARD_NEWTON all=m
+KEYBOARD_OPENCORES all=m
 KEYBOARD_STOWAWAY all=m
 KEYBOARD_SUNKBD all=m sparc=y sparc64=y
 KEYBOARD_XTKBD all=m
@@ -1114,8 +1140,11 @@ INPUT_POWERMATE all=m sparc=n
 INPUT_YEALINK all=m sparc=n
 INPUT_CM109 all=m
 INPUT_UINPUT all=m sparc=n
+INPUT_WINBOND_CIR all=m
 INPUT_PCF50633_PMU all=m
 INPUT_GPIO_ROTARY_ENCODER all=m
+INPUT_WM831X_ON all=m
+INPUT_PCAP all=m
 
 #-
 #- *** FILE: drivers/input/mouse/Kconfig ***
@@ -1128,6 +1157,7 @@ MOUSE_PS2_SYNAPTICS all=y
 MOUSE_PS2_LIFEBOOK all=y
 MOUSE_PS2_TRACKPOINT all=y
 MOUSE_PS2_ELANTECH all=y
+MOUSE_PS2_SENTELIC all=y
 MOUSE_PS2_TOUCHKIT all=y sparc=n
 MOUSE_SERIAL all=m
 MOUSE_APPLETOUCH all=m sparc=n
@@ -1176,6 +1206,7 @@ TOUCHSCREEN_FUJITSU all=m
 TOUCHSCREEN_GUNZE all=m
 TOUCHSCREEN_ELO all=m
 TOUCHSCREEN_WACOM_W8001 all=m
+TOUCHSCREEN_MCS5000 all=m
 TOUCHSCREEN_MTOUCH all=m
 TOUCHSCREEN_INEXIO all=m
 TOUCHSCREEN_MK712 all=m sparc=n
@@ -1200,15 +1231,17 @@ TOUCHSCREEN_USB_IRTOUCH ia64=y
 TOUCHSCREEN_USB_IDEALTEK ia64=y
 TOUCHSCREEN_USB_GENERAL_TOUCH ia64=y
 TOUCHSCREEN_USB_GOTOP ia64=y
+TOUCHSCREEN_USB_E2I all=y
 TOUCHSCREEN_TOUCHIT213 all=m
 TOUCHSCREEN_TSC2007 all=m
 TOUCHSCREEN_W90X900 all=m
+TOUCHSCREEN_PCAP all=m
 
 #-
 #- *** FILE: drivers/isdn/Kconfig ***
 #-
 ISDN all=y s390=n
-ISDN_I4L all=n ppc=m ppc64=m
+ISDN_I4L all=m
 #- file drivers/isdn/mISDN/Kconfig goes here
 #- file drivers/isdn/i4l/Kconfig goes here
 ISDN_CAPI all=m
@@ -1225,16 +1258,16 @@ ISDN_CAPI_MIDDLEWARE all=y
 ISDN_CAPI_CAPI20 all=m
 ISDN_CAPI_CAPIFS_BOOL all=y
 ISDN_CAPI_CAPIFS all=m
-ISDN_CAPI_CAPIDRV ppc=m ppc64=m
+ISDN_CAPI_CAPIDRV all=m
 
 #-
 #- *** FILE: drivers/isdn/gigaset/Kconfig ***
 #-
-ISDN_DRV_GIGASET ppc=m ppc64=m
-GIGASET_BASE ppc=m ppc64=m
-GIGASET_M105 ppc=m ppc64=m
-GIGASET_M101 ppc=m ppc64=m
-GIGASET_DEBUG ppc=n ppc64=n
+ISDN_DRV_GIGASET all=m
+GIGASET_BASE all=m
+GIGASET_M105 all=m
+GIGASET_M101 all=m
+GIGASET_DEBUG all=n
 
 #-
 #- *** FILE: drivers/isdn/hardware/avm/Kconfig ***
@@ -1267,11 +1300,16 @@ ISDN_DIVAS_MAINT all=m
 MISDN_HFCPCI all=m
 MISDN_HFCMULTI all=m
 MISDN_HFCUSB all=m
+MISDN_AVMFRITZ all=m
+MISDN_SPEEDFAX all=m
+MISDN_INFINEON all=m
+MISDN_W6692 all=m
+MISDN_NETJET all=m
 
 #-
 #- *** FILE: drivers/isdn/hisax/Kconfig ***
 #-
-ISDN_DRV_HISAX ppc=n ppc64=n
+ISDN_DRV_HISAX all=n
 #- D-channel protocol features
 #- HiSax supported cards
 #- HiSax PCMCIA card service modules
@@ -1286,16 +1324,16 @@ HYSDN_CAPI all=y
 #-
 #- *** FILE: drivers/isdn/i4l/Kconfig ***
 #-
-ISDN_PPP ppc=y ppc64=y
-ISDN_PPP_VJ ppc=y ppc64=y
-ISDN_MPP ppc=y ppc64=y
-IPPP_FILTER ppc=y ppc64=y
-ISDN_PPP_BSDCOMP ppc=m ppc64=m
-ISDN_AUDIO ppc=y ppc64=y
-ISDN_TTY_FAX ppc=y ppc64=y
-ISDN_X25 ppc=y ppc64=y
+ISDN_PPP all=y
+ISDN_PPP_VJ all=y
+ISDN_MPP all=y
+IPPP_FILTER all=y
+ISDN_PPP_BSDCOMP all=m
+ISDN_AUDIO all=y
+ISDN_TTY_FAX all=y
+ISDN_X25 all=y
 ISDN_DRV_LOOP all=m
-ISDN_DIVERSION ppc=m ppc64=m
+ISDN_DIVERSION all=m
 #- ISDN4Linux hardware drivers
 #- file drivers/isdn/hisax/Kconfig goes here
 #- file drivers/isdn/icn/Kconfig goes here
@@ -1329,6 +1367,7 @@ LEDS_GPIO_OF ppc=y
 LEDS_LP3944 all=m
 LEDS_CLEVO_MAIL all=m
 LEDS_PCA955X all=m
+LEDS_WM831X_STATUS all=m
 LEDS_WM8350 all=m
 LEDS_DA903X all=m
 LEDS_DAC124S085 all=m
@@ -1388,6 +1427,8 @@ MD_RAID0 all=m
 MD_RAID1 all=m
 MD_RAID10 all=m
 MD_RAID456 all=m
+MULTICORE_RAID456 all=n
+ASYNC_RAID6_TEST all=m
 MD_MULTIPATH all=m
 MD_FAULTY all=m
 BLK_DEV_DM all=m
@@ -1437,6 +1478,7 @@ MEDIA_TUNER_CUSTOMISE all=n
 #-
 #- *** FILE: drivers/media/dvb/Kconfig ***
 #-
+DVB_MAX_ADAPTERS all=8
 DVB_DYNAMIC_MINORS all=y
 DVB_CAPTURE_DRIVERS all=y
 #- Supported SAA7146 based PCI Adapters
@@ -1510,6 +1552,7 @@ DVB_USB_ANYSEE all=m
 DVB_USB_DTV5100 all=m
 DVB_USB_AF9015 all=m
 DVB_USB_CE6230 all=m
+DVB_USB_FRIIO all=m
 
 #-
 #- *** FILE: drivers/media/dvb/firewire/Kconfig ***
@@ -1581,6 +1624,11 @@ DVB_DUMMY_FE all=m
 #-
 DVB_PLUTO2 all=m sparc=n
 
+#-
+#- *** FILE: drivers/media/dvb/pt1/Kconfig ***
+#-
+DVB_PT1 all=m
+
 #-
 #- *** FILE: drivers/media/dvb/siano/Kconfig ***
 #-
@@ -1627,7 +1675,10 @@ RADIO_TERRATEC alpha=m i386=m
 RADIO_TRUST alpha=m i386=m
 RADIO_TYPHOON alpha=m i386=m
 RADIO_ZOLTRIX alpha=m i386=m
+I2C_SI4713 all=m
+RADIO_SI4713 all=m
 USB_DSBR all=m
+RADIO_SI470X all=n
 #- file drivers/media/radio/si470x/Kconfig goes here
 USB_MR800 all=m
 RADIO_TEA5764 all=m
@@ -1811,6 +1862,7 @@ USB_GSPCA all=m
 USB_GSPCA_CONEX all=m
 USB_GSPCA_ETOMS all=m
 USB_GSPCA_FINEPIX all=m
+USB_GSPCA_JEILINJ all=m
 USB_GSPCA_MARS all=m
 USB_GSPCA_MR97310A all=m
 USB_GSPCA_OV519 all=m
@@ -1836,6 +1888,11 @@ USB_GSPCA_TV8532 all=m
 USB_GSPCA_VC032X all=m
 USB_GSPCA_ZC3XX all=m
 
+#-
+#- *** FILE: drivers/media/video/gspca/gl860/Kconfig ***
+#-
+USB_GL860 all=m
+
 #-
 #- *** FILE: drivers/media/video/gspca/m5602/Kconfig ***
 #-
@@ -1879,6 +1936,11 @@ VIDEO_SAA7134 all=m sparc=n
 VIDEO_SAA7134_ALSA all=m
 VIDEO_SAA7134_DVB all=m sparc64=n
 
+#-
+#- *** FILE: drivers/media/video/saa7164/Kconfig ***
+#-
+VIDEO_SAA7164 all=m
+
 #-
 #- *** FILE: drivers/media/video/sn9c102/Kconfig ***
 #-
@@ -1980,11 +2042,14 @@ TPS65010 all=m
 TWL4030_CORE powerpc=y
 PMIC_DA903X ppc=y
 MFD_WM8400 all=m
+MFD_WM831X all=m
 MFD_WM8350_I2C all=m
 MFD_PCF50633 all=m
+MFD_MC13783 all=m
 PCF50633_ADC all=m
 PCF50633_GPIO all=m
 AB3100_CORE all=m
+AB3100_OTP all=m
 EZX_PCAP all=y
 
 #-
@@ -2143,6 +2208,7 @@ MTD_DATAFLASH_WRITE_VERIFY all=y
 MTD_DATAFLASH_OTP all=y
 MTD_M25P80 all=m ppc=n ppc64=n sparc=n
 M25PXX_USE_FAST_READ all=y
+MTD_SST25L all=m
 MTD_SLRAM all=m
 MTD_PHRAM all=m
 MTD_MTDRAM all=m
@@ -2189,6 +2255,7 @@ 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_GPIO_ADDR all=m
 MTD_INTEL_VR_NOR all=m
 MTD_PLATRAM all=m
 
@@ -2217,6 +2284,7 @@ MTD_NAND_FSL_ELBC ppc=m ppc64=m
 #-
 MTD_ONENAND all=m
 MTD_ONENAND_VERIFY_WRITE all=n sparc=y sparc64=y
+MTD_ONENAND_GENERIC all=m
 MTD_ONENAND_OTP all=n alpha=y i386=y x86_64=y
 MTD_ONENAND_2X_PROGRAM all=y
 MTD_ONENAND_SIM all=m
@@ -2341,6 +2409,7 @@ SUNDANCE_MMIO all=n sparc=y sparc64=y
 TLAN all=m sparc=n
 KS8842 all=m
 KS8851 all=m
+KS8851_MLL all=m
 VIA_RHINE all=m
 VIA_RHINE_MMIO all=y alpha=n
 SC92031 all=m
@@ -2453,6 +2522,7 @@ NETCONSOLE all=m
 NETCONSOLE_DYNAMIC all=y
 NETPOLL_TRAP all=y
 VIRTIO_NET all=m
+VMXNET3 all=m
 
 #-
 #- *** FILE: drivers/net/appletalk/Kconfig ***
@@ -2505,6 +2575,11 @@ CAN_SJA1000_PLATFORM all=m
 CAN_EMS_PCI all=m
 CAN_KVASER_PCI all=m
 
+#-
+#- *** FILE: drivers/net/can/usb/Kconfig ***
+#-
+CAN_EMS_USB all=m
+
 #-
 #- *** FILE: drivers/net/hamradio/Kconfig ***
 #-
@@ -2723,6 +2798,7 @@ WIMAX_I2400M_DEBUG_LEVEL all=8
 #-
 #- *** FILE: drivers/net/wireless/Kconfig ***
 #-
+WLAN all=y
 WLAN_PRE80211 all=y ppc=n ppc64=n
 STRIP all=m
 ARLAN i386=m
@@ -2767,6 +2843,14 @@ MWL8K all=m
 #- file drivers/net/wireless/wl12xx/Kconfig goes here
 #- file drivers/net/wireless/iwmc3200wifi/Kconfig goes here
 
+#-
+#- *** FILE: drivers/net/wireless/ath/Kconfig ***
+#-
+ATH_COMMON all=m
+#- 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/ar9170/Kconfig ***
 #-
@@ -2789,6 +2873,8 @@ ATH9K_DEBUG all=n
 #-
 B43 all=m
 B43_PCMCIA all=y
+B43_SDIO all=y
+B43_PHY_LP all=y
 B43_DEBUG all=n
 
 #-
@@ -2881,6 +2967,10 @@ RT2X00_DEBUG all=n
 #- *** FILE: drivers/net/wireless/wl12xx/Kconfig ***
 #-
 WL12XX all=m
+WL1251 all=m
+WL1251_SPI all=m
+WL1251_SDIO all=m
+WL1271 all=m
 
 #-
 #- *** FILE: drivers/net/wireless/zd1211rw/Kconfig ***
@@ -3009,6 +3099,7 @@ INTEL_MENLOW all=m
 EEEPC_LAPTOP all=m
 ACPI_WMI all=m
 ACPI_ASUS i386=m x86_64=m
+TOPSTAR_LAPTOP all=m
 ACPI_TOSHIBA i386=m x86_64=m
 
 #-
@@ -3045,6 +3136,7 @@ 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_POWER all=m
 WM8350_POWER all=m
 BATTERY_DS2760 all=m
 BATTERY_DS2782 all=m
@@ -3071,11 +3163,17 @@ REGULATOR_USERSPACE_CONSUMER all=m
 REGULATOR_BQ24022 all=m
 REGULATOR_MAX1586 all=m
 REGULATOR_TWL4030 ppc=y
+REGULATOR_WM831X all=m
 REGULATOR_WM8350 all=m
 REGULATOR_WM8400 all=m
 REGULATOR_DA903X all=m
 REGULATOR_PCF50633 all=m
 REGULATOR_LP3971 all=m
+REGULATOR_PCAP all=m
+REGULATOR_MC13783 all=m
+REGULATOR_AB3100 all=m
+REGULATOR_TPS65023 all=m
+REGULATOR_TPS6507X all=m
 
 #-
 #- *** FILE: drivers/rtc/Kconfig ***
@@ -3116,6 +3214,7 @@ RTC_DRV_MAX6902 all=m
 RTC_DRV_R9701 all=m
 RTC_DRV_RS5C348 all=m
 RTC_DRV_DS3234 all=m
+RTC_DRV_PCF2123 all=m
 #- Platform RTC drivers
 RTC_DRV_CMOS all=y
 RTC_DRV_DS1286 all=m
@@ -3128,10 +3227,13 @@ RTC_DRV_M48T35 all=m
 RTC_DRV_M48T59 all=m
 RTC_DRV_BQ4802 all=m
 RTC_DRV_V3020 all=m
+RTC_DRV_WM831X all=m
 RTC_DRV_WM8350 all=m
 RTC_DRV_PCF50633 all=m
+RTC_DRV_AB3100 all=m
 #- on-CPU RTC drivers
 RTC_DRV_GENERIC ppc=y
+RTC_DRV_PCAP all=m
 
 #-
 #- *** FILE: drivers/sbus/char/Kconfig ***
@@ -3273,7 +3375,9 @@ SCSI_MESH_RESET_DELAY_MS ppc=4000
 SCSI_MAC53C94 ppc=m
 #- file drivers/scsi/arm/Kconfig goes here
 SCSI_SUNESP sparc=m sparc64=m
+SCSI_PMCRAID all=m
 SCSI_SRP all=m sparc=n
+SCSI_BFA_FC all=m
 #- file drivers/scsi/pcmcia/Kconfig goes here
 #- file drivers/scsi/device_handler/Kconfig goes here
 #- file drivers/scsi/osd/Kconfig goes here
@@ -3304,6 +3408,11 @@ AIC7XXX_REG_PRETTY_PRINT all=y
 SCSI_AIC94XX all=m sparc=n
 AIC94XX_DEBUG all=n
 
+#-
+#- *** FILE: drivers/scsi/be2iscsi/Kconfig ***
+#-
+BE2ISCSI all=m
+
 #-
 #- *** FILE: drivers/scsi/bnx2i/Kconfig ***
 #-
@@ -3429,6 +3538,11 @@ SERIAL_SGI_IOC4 ia64=m
 SERIAL_SGI_IOC3 ia64=m
 SERIAL_OF_PLATFORM ppc=m ppc64=m
 
+#-
+#- *** FILE: drivers/sfi/Kconfig ***
+#-
+SFI all=y
+
 #-
 #- *** FILE: drivers/sn/Kconfig ***
 #-
@@ -3539,6 +3653,19 @@ COMEDI_PCI_DRIVERS all=m
 COMEDI_PCMCIA_DRIVERS all=m
 COMEDI_USB_DRIVERS all=m
 
+#-
+#- *** FILE: drivers/staging/cx25821/Kconfig ***
+#-
+VIDEO_CX25821 all=m
+VIDEO_CX25821_ALSA all=m
+
+#-
+#- *** FILE: drivers/staging/dream/Kconfig ***
+#-
+#- file drivers/staging/dream/smd/Kconfig goes here
+#- file drivers/staging/dream/camera/Kconfig goes here
+INPUT_GPIO all=m
+
 #-
 #- *** FILE: drivers/staging/dst/Kconfig ***
 #-
@@ -3566,7 +3693,53 @@ TRANZPORT all=m
 #-
 VIDEO_GO7007 all=m
 VIDEO_GO7007_USB all=m
-VIDEO_GO7007_USB_S2250_BOARD all=m
+#* broken
+VIDEO_GO7007_USB_S2250_BOARD all=n
+VIDEO_GO7007_OV7640 all=m
+VIDEO_GO7007_SAA7113 all=m
+VIDEO_GO7007_SAA7115 all=m
+VIDEO_GO7007_TW9903 all=m
+VIDEO_GO7007_UDA1342 all=m
+VIDEO_GO7007_SONY_TUNER all=m
+VIDEO_GO7007_TW2804 all=m
+
+#-
+#- *** FILE: drivers/staging/hv/Kconfig ***
+#-
+HYPERV all=m
+HYPERV_STORAGE all=m
+HYPERV_BLOCK all=m
+HYPERV_NET all=m
+
+#-
+#- *** FILE: drivers/staging/iio/Kconfig ***
+#-
+IIO all=m
+IIO_RING_BUFFER all=n
+IIO_TRIGGER all=n
+#- file drivers/staging/iio/accel/Kconfig goes here
+#- file drivers/staging/iio/adc/Kconfig goes here
+#- file drivers/staging/iio/light/Kconfig goes here
+#- file drivers/staging/iio/trigger/Kconfig goes here
+
+#-
+#- *** FILE: drivers/staging/iio/accel/Kconfig ***
+#-
+#- Accelerometers
+KXSD9 all=m
+LIS3L02DQ all=m
+
+#-
+#- *** FILE: drivers/staging/iio/adc/Kconfig ***
+#-
+#- Analog to digital convertors
+MAX1363 all=m
+
+#-
+#- *** FILE: drivers/staging/iio/light/Kconfig ***
+#-
+#- Light sensors
+TSL2561 all=m
 
 #-
 #- *** FILE: drivers/staging/line6/Kconfig ***
@@ -3613,6 +3786,16 @@ POHMELFS all=m
 POHMELFS_DEBUG all=n
 POHMELFS_CRYPTO all=y
 
+#-
+#- *** FILE: drivers/staging/quatech_usb2/Kconfig ***
+#-
+USB_SERIAL_QUATECH_USB2 all=m
+
+#-
+#- *** FILE: drivers/staging/rar/Kconfig ***
+#-
+RAR_REGISTER all=m
+
 #-
 #- *** FILE: drivers/staging/rt2860/Kconfig ***
 #-
@@ -3623,16 +3806,31 @@ RT2860 all=m
 #-
 RT2870 all=m
 
+#-
+#- *** FILE: drivers/staging/rt3090/Kconfig ***
+#-
+RT3090 all=m
+
 #-
 #- *** FILE: drivers/staging/rtl8187se/Kconfig ***
 #-
 RTL8187SE all=m
 
+#-
+#- *** FILE: drivers/staging/rtl8192e/Kconfig ***
+#-
+RTL8192E all=m
+
 #-
 #- *** FILE: drivers/staging/rtl8192su/Kconfig ***
 #-
 RTL8192SU all=m
 
+#-
+#- *** FILE: drivers/staging/sep/Kconfig ***
+#-
+DX_SEP all=m
+
 #-
 #- *** FILE: drivers/staging/serqt_usb2/Kconfig ***
 #-
@@ -3655,11 +3853,36 @@ USB_IP_COMMON all=m
 USB_IP_VHCI_HCD all=m
 USB_IP_HOST all=m
 
+#-
+#- *** FILE: drivers/staging/vme/Kconfig ***
+#-
+VME_BUS all=m
+#- file drivers/staging/vme/bridges/Kconfig goes here
+#- file drivers/staging/vme/devices/Kconfig goes here
+
+#-
+#- *** FILE: drivers/staging/vme/bridges/Kconfig ***
+#-
+#- VME Bridge Drivers
+VME_CA91CX42 all=m
+VME_TSI148 all=m
+
+#-
+#- *** FILE: drivers/staging/vme/devices/Kconfig ***
+#-
+#- VME Device Drivers
+VME_USER all=m
+
 #-
 #- *** FILE: drivers/staging/vt6655/Kconfig ***
 #-
 VT6655 all=m
 
+#-
+#- *** FILE: drivers/staging/vt6656/Kconfig ***
+#-
+VT6656 all=m
+
 #-
 #- *** FILE: drivers/staging/winbond/Kconfig ***
 #-
@@ -3692,6 +3915,7 @@ UIO_PDRV_GENIRQ all=m
 UIO_SMX all=m
 UIO_AEC all=m
 UIO_SERCOS3 all=m
+UIO_PCI_GENERIC all=m
 
 #-
 #- *** FILE: drivers/usb/Kconfig ***
@@ -3763,6 +3987,7 @@ USB_GADGET_ATMEL_USBA ia64=n sparc64=n
 USB_GADGET_FSL_USB2 all=n
 USB_GADGET_LH7A40X all=n
 USB_GADGET_OMAP all=n
+USB_GADGET_R8A66597 all=n
 USB_GADGET_S3C2410 all=n
 USB_GADGET_MUSB_HDRC all=n
 USB_GADGET_M66592 all=n
@@ -3780,6 +4005,7 @@ USB_ZERO_HNPTEST all=n
 USB_AUDIO all=m
 USB_ETH all=m
 USB_ETH_RNDIS all=y
+USB_ETH_EEM all=y
 USB_GADGETFS all=m
 USB_FILE_STORAGE all=m
 USB_FILE_STORAGE_TEST all=n
@@ -3804,6 +4030,7 @@ USB_EHCI_HCD_PPC_OF ppc=y ppc64=y
 USB_OXU210HP_HCD all=m
 USB_ISP116X_HCD all=m
 USB_ISP1760_HCD all=m
+USB_ISP1362_HCD all=m
 USB_OHCI_HCD all=m
 USB_OHCI_HCD_PPC_SOC ppc=y
 USB_OHCI_HCD_PPC_OF_BE ppc=y ppc64=y
@@ -4115,6 +4342,7 @@ FB_BROADSHEET all=m
 #-
 BACKLIGHT_LCD_SUPPORT all=y
 LCD_CLASS_DEVICE all=m
+LCD_LMS283GF05 all=m
 LCD_LTV350QV all=m
 LCD_TDO24M all=m
 LCD_VGG2432A4 all=m
@@ -4126,6 +4354,7 @@ BACKLIGHT_CARILLO_RANCH i386=m x86_64=m
 BACKLIGHT_DA903X all=m
 BACKLIGHT_MBP_NVIDIA all=m
 BACKLIGHT_SAHARA all=m
+BACKLIGHT_WM831X all=m
 
 #-
 #- *** FILE: drivers/video/console/Kconfig ***
@@ -4215,12 +4444,14 @@ WATCHDOG all=y
 WATCHDOG_NOWAYOUT all=n
 #- Watchdog Device Drivers
 SOFT_WATCHDOG all=m
+WM831X_WATCHDOG all=m
 WM8350_WATCHDOG all=m
 ACQUIRE_WDT i386=m x86_64=m
 ADVANTECH_WDT i386=m x86_64=m
 ALIM1535_WDT i386=m x86_64=m
 ALIM7101_WDT all=m
 SC520_WDT i386=m x86_64=m
+SBC_FITPC2_WATCHDOG all=m
 EUROTECH_WDT i386=m x86_64=m
 IB700_WDT i386=m x86_64=m
 IBMASR i386=m x86_64=m
@@ -4265,6 +4496,7 @@ USBPCWATCHDOG all=m
 #- *** FILE: fs/9p/Kconfig ***
 #-
 9P_FS all=m
+9P_FSCACHE all=n
 
 #-
 #- *** FILE: fs/Kconfig ***
@@ -4481,6 +4713,7 @@ EXT4_FS all=m
 EXT4_FS_XATTR all=y
 EXT4_FS_POSIX_ACL all=y
 EXT4_FS_SECURITY all=y
+EXT4_DEBUG all=n
 
 #-
 #- *** FILE: fs/fat/Kconfig ***
@@ -4503,6 +4736,7 @@ FSCACHE all=m
 FSCACHE_STATS=y
 FSCACHE_HISTOGRAM all=n
 FSCACHE_DEBUG all=n
+FSCACHE_OBJECT_LIST all=n
 
 #-
 #- *** FILE: fs/fuse/Kconfig ***
@@ -4840,7 +5074,10 @@ TASK_XACCT all=y
 TASK_IO_ACCOUNTING all=y
 AUDIT all=y
 AUDITSYSCALL all=y
-TREE_RCU all=n
+TREE_RCU all=y
+RCU_TRACE all=n
+RCU_FANOUT all=64
+RCU_FANOUT_EXACT all=n
 IKCONFIG all=m
 IKCONFIG_PROC all=y
 LOG_BUF_SHIFT all=16
@@ -4890,8 +5127,10 @@ SIGNALFD all=y
 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
 COMPAT_BRK all=n
 SLAB all=n
@@ -4899,6 +5138,7 @@ SLUB all=y
 SLOB all=n
 PROFILING all=y
 #- file arch/Kconfig goes here
+SLOW_WORK_DEBUG all=n
 SLABINFO all=y
 RT_MUTEXES all=y
 BASE_SMALL all=0
@@ -4944,6 +5184,7 @@ SUSPEND_FREEZER ppc=y ppc64=y
 HIBERNATION all=y
 PM_STD_PARTITION all=""
 APM_EMULATION ppc=m
+PM_RUNTIME all=y
 
 #-
 #- *** FILE: kernel/time/Kconfig ***
@@ -4955,7 +5196,7 @@ HIGH_RES_TIMERS all=y alpha= ia64=
 #-
 #- *** FILE: kernel/trace/Kconfig ***
 #-
-CONTEXT_SWITCH_TRACER all=n
+CONTEXT_SWITCH_TRACER all=y
 FTRACE all=y
 FUNCTION_TRACER all=n
 IRQSOFF_TRACER all=n
@@ -5050,6 +5291,7 @@ DEBUG_WRITECOUNT all=n
 DEBUG_LIST all=n
 DEBUG_SG all=n
 DEBUG_NOTIFIERS all=n
+DEBUG_CREDENTIALS all=n
 FRAME_POINTER i386=y x86_64=y
 BOOT_PRINTK_DELAY all=n
 RCU_TORTURE_TEST all=m
@@ -5057,6 +5299,7 @@ RCU_CPU_STALL_DETECTOR all=n
 KPROBES_SANITY_TEST all=n
 BACKTRACE_SELF_TEST all=m
 DEBUG_BLOCK_EXT_DEVT all=n
+DEBUG_FORCE_WEAK_PER_CPU all=n
 LKDTM all=m
 FAULT_INJECTION all=n
 LATENCYTOP all=n
@@ -5098,7 +5341,10 @@ SPLIT_PTLOCK_CPUS all=4
 MIGRATION all=y
 ZONE_DMA_FLAG all=1 sparc64=0
 NR_QUICK sparc64=1
+KSM all=n
 DEFAULT_MMAP_MIN_ADDR all=0 x86_64=65536 i386=65536 sparc64=8192 ppc=65536
+MEMORY_FAILURE all=y
+HWPOISON_INJECT all=m
 
 #-
 #- *** FILE: net/8021q/Kconfig ***
@@ -5495,13 +5741,15 @@ PHONET all=m
 #- *** FILE: net/rds/Kconfig ***
 #-
 RDS all=m
+RDS_RDMA all=m
+RDS_TCP all=m
 RDS_DEBUG all=n
 
 #-
 #- *** FILE: net/rfkill/Kconfig ***
 #-
 RFKILL all=m sparc=n
-RFKILL_INPUT all=m sparc=
+RFKILL_INPUT all=y sparc=
 
 #-
 #- *** FILE: net/rxrpc/Kconfig ***
@@ -5610,7 +5858,10 @@ WIMAX_DEBUG_LEVEL all=8
 #- *** FILE: net/wireless/Kconfig ***
 #-
 CFG80211 all=m sparc=n
+NL80211_TESTMODE all=n
+CFG80211_DEVELOPER_WARNINGS all=n
 CFG80211_REG_DEBUG all=n
+CFG80211_DEFAULT_PS all=y
 CFG80211_DEBUGFS all=n
 WIRELESS_OLD_REGULATORY all=y
 WIRELESS_EXT all=y
@@ -5686,6 +5937,7 @@ SECURITY_TOMOYO all=y
 #- *** FILE: sound/Kconfig ***
 #-
 SOUND all=m
+SOUND_OSS_CORE_PRECLAIM all=y
 #- file sound/oss/dmasound/Kconfig goes here
 SND all=m
 #- file sound/core/Kconfig goes here
@@ -5874,7 +6126,7 @@ SND_CS4281 all=m
 SND_CS46XX all=m
 SND_CS46XX_NEW_DSP all=y
 SND_CS5530 alpha=m i386=m ppc=m ppc64=m x86_64=m
-SND_CS5535AUDIO i386=m
+SND_CS5535AUDIO all=m
 SND_CTXFI all=m
 SND_DARLA20 all=m
 SND_GINA20 all=m
@@ -5932,9 +6184,10 @@ SND_YMFPCI all=m
 #-
 SND_HDA_INTEL all=m sparc=n
 SND_HDA_HWDEP all=y
-SND_HDA_RECONFIG all=n
+SND_HDA_RECONFIG all=y
 SND_HDA_INPUT_BEEP all=y
 SND_HDA_INPUT_JACK all=y
+SND_HDA_PATCH_LOADER all=y
 SND_HDA_CODEC_REALTEK all=y
 SND_HDA_CODEC_ANALOG all=y
 SND_HDA_CODEC_SIGMATEL all=y
@@ -5942,6 +6195,7 @@ 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
 SND_HDA_CODEC_CMEDIA all=y

diff --git a/kernel-x86.config b/kernel-x86.config
index 40f376d705063e2c2f3af34989cb6cb2c762965e..db2901f556d8a899da765b47e640d44ae5d19f6e 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -168,6 +168,7 @@ MVIAC3_2 i386=n
 MVIAC7 i386=n
 MPSC x86_64=n
 MCORE2 x86=n
+MATOM x86=n
 GENERIC_CPU x86_64=y amd64=n
 X86_GENERIC i386=y i586=n i686=n pentium3=n pentium4=n athlon=n
 #* do we care ?