- config updated

Changed files:
    kernel-multiarch.config -> 1.18
    kernel-x86.config -> 1.13

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 827cf2558568c0fcd7c2c83d49d7dd278fbabd33..d63eefe982dd12831a9bfe9664ad5b9b4831a028 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -4,6 +4,8 @@
 #-
 DEBUG_RODATA all=y
 DEBUG_RODATA_TEST all=n
+IOMMU_STRESS all=n
+X86_MCE_INJECT all=m
 
 #-
 #- *** FILE: block/Kconfig ***
@@ -11,6 +13,7 @@ DEBUG_RODATA_TEST all=n
 BLOCK all=y
 BLK_DEV_BSG all=y
 BLK_DEV_INTEGRITY all=y
+LBDAF i386=y
 #- file block/Kconfig.iosched goes here
 
 #-
@@ -292,6 +295,7 @@ BLK_DEV_COW_COMMON all=n
 BLK_DEV_LOOP all=m
 BLK_DEV_CRYPTOLOOP all=n
 BLK_DEV_NBD all=m
+BLK_DEV_OSD all=m
 BLK_DEV_SX8 all=m
 BLK_DEV_UB all=n
 BLK_DEV_RAM all=y
@@ -462,7 +466,7 @@ HW_RANDOM_INTEL all=m
 HW_RANDOM_AMD i386=m x86_64=m
 HW_RANDOM_GEODE i386=m x86_64=m
 HW_RANDOM_N2RNG sparc64=m
-HW_RANDOM_VIA i386=m
+HW_RANDOM_VIA all=m
 HW_RANDOM_PASEMI ppc64=m
 HW_RANDOM_VIRTIO=m
 
@@ -526,9 +530,9 @@ CPU_IDLE i386=y sparc64=n x86_64=y
 #- *** FILE: drivers/crypto/Kconfig ***
 #-
 CRYPTO_HW all=y
-CRYPTO_DEV_PADLOCK i386=m
-CRYPTO_DEV_PADLOCK_AES i386=m
-CRYPTO_DEV_PADLOCK_SHA i386=m
+CRYPTO_DEV_PADLOCK all=m
+CRYPTO_DEV_PADLOCK_AES all=m
+CRYPTO_DEV_PADLOCK_SHA all=m
 CRYPTO_DEV_GEODE i386=m
 CRYPTO_DEV_HIFN_795X all=m
 CRYPTO_DEV_HIFN_795X_RNG all=y
@@ -554,6 +558,8 @@ EDAC all=y
 #- Reporting subsystems
 EDAC_DEBUG all=n
 EDAC_MM_EDAC all=m
+EDAC_AMD64 x86_64=m
+EDAC_AMD64_ERROR_INJECTION x86_64=y
 EDAC_AMD76X i386=m
 EDAC_E7XXX i386=m
 EDAC_E752X i386=m x86_64=m
@@ -585,6 +591,7 @@ EISA_NAMES alpha=y i386=y
 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/firmware/Kconfig ***
@@ -634,6 +641,11 @@ DRM_SIS all=m
 DRM_VIA all=m
 DRM_SAVAGE all=m
 
+#-
+#- *** FILE: drivers/gpu/drm/radeon/Kconfig ***
+#-
+DRM_RADEON_KMS all=n
+
 #-
 #- *** FILE: drivers/hid/Kconfig ***
 #-
@@ -642,13 +654,14 @@ HID all=m
 HID_DEBUG all=n
 HIDRAW all=y
 #- file drivers/hid/usbhid/Kconfig goes here
-DRAGONRISE_FF all=m
+DRAGONRISE_FF all=y
 LOGITECH_FF all=y
 LOGIRUMBLEPAD2_FF all=y
 PANTHERLORD_FF all=y
-GREENASIA_FF all=m
-THRUSTMASTER_FF all=m
-ZEROPLUS_FF all=m
+GREENASIA_FF all=y
+SMARTJOYPLUS_FF all=y
+THRUSTMASTER_FF all=y
+ZEROPLUS_FF all=y
 
 #-
 #- *** FILE: drivers/hid/usbhid/Kconfig ***
@@ -732,6 +745,7 @@ SENSORS_SMSC47M192 all=m
 SENSORS_SMSC47B397 all=m
 SENSORS_ADS7828 all=m
 SENSORS_THMC50 all=m
+SENSORS_TMP401 all=m
 SENSORS_VIA686A all=m
 SENSORS_VT1211 all=m
 SENSORS_VT8231 all=m
@@ -924,6 +938,12 @@ IEEE1394_VIDEO1394 all=m sparc=
 IEEE1394_DV1394 all=m sparc=
 IEEE1394_VERBOSEDEBUG all=n sparc=
 
+#-
+#- *** FILE: drivers/ieee802154/Kconfig ***
+#-
+IEEE802154_DRIVERS all=m
+IEEE802154_FAKEHARD all=m
+
 #-
 #- *** FILE: drivers/infiniband/Kconfig ***
 #-
@@ -1073,6 +1093,8 @@ INPUT_KEYBOARD all=y
 KEYBOARD_ATKBD all=y sparc=m sparc64=m
 KEYBOARD_LKKBD all=m
 KEYBOARD_GPIO all=m
+KEYBOARD_MATRIX all=m
+KEYBOARD_LM8323 all=m
 KEYBOARD_NEWTON all=m
 KEYBOARD_STOWAWAY all=m
 KEYBOARD_SUNKBD all=m sparc=y sparc64=y
@@ -1118,6 +1140,7 @@ MOUSE_LOGIBM alpha=m i386=m
 MOUSE_PC110PAD alpha=m i386=m
 MOUSE_VSXXXAA all=m
 MOUSE_GPIO all=m
+MOUSE_SYNAPTICS_I2C all=m
 
 #-
 #- *** FILE: drivers/input/serio/Kconfig ***
@@ -1150,6 +1173,7 @@ TOUCHSCREEN_ADS7846 all=m sparc=n
 TOUCHSCREEN_AD7877 all=m
 TOUCHSCREEN_AD7879_I2C all=m
 TOUCHSCREEN_DA9034 all=m
+TOUCHSCREEN_EETI all=m
 TOUCHSCREEN_FUJITSU all=m
 TOUCHSCREEN_GUNZE all=m
 TOUCHSCREEN_ELO all=m
@@ -1180,6 +1204,7 @@ TOUCHSCREEN_USB_GENERAL_TOUCH ia64=y
 TOUCHSCREEN_USB_GOTOP ia64=y
 TOUCHSCREEN_TOUCHIT213 all=m
 TOUCHSCREEN_TSC2007 all=m
+TOUCHSCREEN_W90X900 all=m
 
 #-
 #- *** FILE: drivers/isdn/Kconfig ***
@@ -1303,6 +1328,7 @@ LEDS_PCA9532 all=m
 LEDS_GPIO all=m
 LEDS_GPIO_PLATFORM all=y
 LEDS_GPIO_OF ppc=y
+LEDS_LP3944 all=m
 LEDS_CLEVO_MAIL all=m
 LEDS_PCA955X all=m
 LEDS_WM8350 all=m
@@ -1371,14 +1397,18 @@ DM_DEBUG all=n
 DM_CRYPT all=m
 DM_SNAPSHOT all=m
 DM_MIRROR all=m
+DM_LOG_USERSPACE all=m
 DM_ZERO all=m
 DM_MULTIPATH all=m
+DM_MULTIPATH_QL all=m
+DM_MULTIPATH_ST all=m
 DM_DELAY all=m
 DM_UEVENT all=y
 
 #-
 #- *** FILE: drivers/media/Kconfig ***
 #-
+MEDIA_SUPPORT all=m
 #- Multimedia core support
 VIDEO_DEV all=m
 VIDEO_V4L2_COMMON all=m
@@ -1551,6 +1581,13 @@ DVB_DUMMY_FE all=m
 #-
 DVB_PLUTO2 all=m sparc=n
 
+#-
+#- *** FILE: drivers/media/dvb/siano/Kconfig ***
+#-
+SMS_SIANO_MDTV all=m
+SMS_USB_DRV all=m
+SMS_SDIO_DRV all=m
+
 #-
 #- *** FILE: drivers/media/dvb/ttpci/Kconfig ***
 #-
@@ -1774,6 +1811,8 @@ USB_GSPCA_OV519 all=m
 USB_GSPCA_OV534 all=m
 USB_GSPCA_PAC207 all=m
 USB_GSPCA_PAC7311 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
@@ -1939,6 +1978,8 @@ MFD_WM8350_I2C all=m
 MFD_PCF50633 all=m
 PCF50633_ADC all=m
 PCF50633_GPIO all=m
+AB3100_CORE all=m
+EZX_PCAP all=y
 
 #-
 #- *** FILE: drivers/misc/Kconfig ***
@@ -1967,12 +2008,19 @@ ISL29003 all=m
 C2PORT all=m
 C2PORT_DURAMAR_2150 all=m
 
+#-
+#- *** FILE: drivers/misc/cb710/Kconfig ***
+#-
+CB710_CORE all=m
+CB710_DEBUG all=n
+
 #-
 #- *** FILE: drivers/misc/eeprom/Kconfig ***
 #-
 EEPROM_AT24 all=m
 EEPROM_AT25 all=m
 EEPROM_LEGACY all=m
+EEPROM_MAX6875 all=m
 EEPROM_93CX6 all=m
 
 #-
@@ -2006,10 +2054,13 @@ MMC_SDHCI all=m sparc=n
 MMC_SDHCI_PCI all=m
 MMC_RICOH_MMC all=m
 MMC_SDHCI_OF ppc=m
+MMC_SDHCI_PLTFM all=m
 MMC_WBSD all=m
 MMC_TIFM_SD all=m
 MMC_SPI all=m
 MMC_SDRICOH_CS all=m
+MMC_CB710 all=m
+MMC_VIA_SDMMC all=m
 
 #-
 #- *** FILE: drivers/mtd/Kconfig ***
@@ -2282,6 +2333,8 @@ SMSC9420 all=m
 SUNDANCE all=m
 SUNDANCE_MMIO all=n sparc=y sparc64=y
 TLAN all=m sparc=n
+KS8842 all=m
+KS8851 all=m
 VIA_RHINE all=m
 VIA_RHINE_MMIO all=y alpha=n
 SC92031 all=m
@@ -2318,6 +2371,7 @@ SKY2_DEBUG all=n
 VIA_VELOCITY all=m
 TIGON3 all=m
 BNX2 all=m sparc=n
+CNIC all=m
 SPIDER_NET ppc64=m
 GELIC_NET ppc64=m
 GELIC_WIRELESS ppc64=y
@@ -2430,6 +2484,12 @@ BE2NET all=m
 #- *** FILE: drivers/net/can/Kconfig ***
 #-
 CAN_VCAN all=m
+CAN_DEV all=m
+CAN_CALC_BITTIMING all=y
+CAN_SJA1000 all=m
+CAN_SJA1000_PLATFORM all=m
+CAN_EMS_PCI all=m
+CAN_KVASER_PCI all=m
 CAN_DEBUG_DEVICES all=n
 
 #-
@@ -2555,6 +2615,7 @@ SMCTR all=m
 #-
 NET_TULIP all=y
 DE2104X all=m
+DE2104X_DSL all=0
 TULIP all=m
 TULIP_MWI all=n
 TULIP_MMIO all=n
@@ -2594,6 +2655,8 @@ USB_EPSON2888 all=y ppc=n ppc64=n
 USB_KC2190 all=y
 USB_NET_ZAURUS all=m
 USB_HSO all=m
+USB_NET_INT51X1 all=m
+USB_CDC_PHONET all=m
 
 #-
 #- *** FILE: drivers/net/wan/Kconfig ***
@@ -2761,6 +2824,12 @@ IWL5000 all=y
 IWL3945 all=m
 IWL3945_SPECTRUM_MEASUREMENT all=y
 
+#-
+#- *** FILE: drivers/net/wireless/iwmc3200wifi/Kconfig ***
+#-
+IWM all=m
+IWM_DEBUG all=n
+
 #-
 #- *** FILE: drivers/net/wireless/orinoco/Kconfig ***
 #-
@@ -2791,10 +2860,16 @@ RT2500PCI all=m
 RT61PCI all=m
 RT2500USB all=m
 RT73USB all=m
+RT2800USB all=m
 #- rt2x00 rfkill support disabled due to modularized INPUT and built-in rt2x00
 #- rt2x00 leds support disabled due to modularized LEDS_CLASS and built-in rt2x00
 RT2X00_DEBUG all=n
 
+#-
+#- *** FILE: drivers/net/wireless/wl12xx/Kconfig ***
+#-
+WL12XX all=m
+
 #-
 #- *** FILE: drivers/net/wireless/zd1211rw/Kconfig ***
 #-
@@ -2865,8 +2940,14 @@ PCIEASPM all=n
 #- *** FILE: drivers/pci/pcie/aer/Kconfig ***
 #-
 PCIEAER all=y
+PCIE_ECRC all=y
 #- file drivers/pci/pcie/aer/Kconfig.debug goes here
 
+#-
+#- *** FILE: drivers/pci/pcie/aer/Kconfig.debug ***
+#-
+PCIEAER_INJECT all=m
+
 #-
 #- *** FILE: drivers/pcmcia/Kconfig ***
 #-
@@ -2954,11 +3035,19 @@ PDA_POWER all=m
 APM_POWER ppc=m
 WM8350_POWER all=m
 BATTERY_DS2760 all=m
+BATTERY_DS2782 all=m
 BATTERY_PMU ppc=m
 BATTERY_BQ27x00 all=m
 BATTERY_DA9030 all=m
+BATTERY_MAX17040 all=m
 CHARGER_PCF50633 all=m
 
+#-
+#- *** FILE: drivers/pps/Kconfig ***
+#-
+PPS all=m
+PPS_DEBUG all=n
+
 #-
 #- *** FILE: drivers/regulator/Kconfig ***
 #-
@@ -2966,12 +3055,15 @@ REGULATOR all=y
 REGULATOR_DEBUG all=n
 REGULATOR_FIXED_VOLTAGE all=m
 REGULATOR_VIRTUAL_CONSUMER all=m
+REGULATOR_USERSPACE_CONSUMER all=m
 REGULATOR_BQ24022 all=m
+REGULATOR_MAX1586 all=m
 REGULATOR_TWL4030 ppc=y
 REGULATOR_WM8350 all=m
 REGULATOR_WM8400 all=m
 REGULATOR_DA903X all=m
 REGULATOR_PCF50633 all=m
+REGULATOR_LP3971 all=m
 
 #-
 #- *** FILE: drivers/rtc/Kconfig ***
@@ -3003,6 +3095,7 @@ RTC_DRV_TWL4030 all=m
 RTC_DRV_S35390A all=m
 RTC_DRV_FM3130 all=m
 RTC_DRV_RX8581 all=m
+RTC_DRV_RX8025 all=m
 #- SPI RTC drivers
 RTC_DRV_M41T94 all=m
 RTC_DRV_DS1305 all=m
@@ -3198,6 +3291,11 @@ AIC7XXX_REG_PRETTY_PRINT all=y
 SCSI_AIC94XX all=m sparc=n
 AIC94XX_DEBUG all=n
 
+#-
+#- *** FILE: drivers/scsi/bnx2i/Kconfig ***
+#-
+SCSI_BNX2_ISCSI all=m
+
 #-
 #- *** FILE: drivers/scsi/cxgb3i/Kconfig ***
 #-
@@ -3240,6 +3338,7 @@ SCSI_MPT2SAS_LOGGING all=y
 #- *** FILE: drivers/scsi/mvsas/Kconfig ***
 #-
 SCSI_MVSAS all=m
+SCSI_MVSAS_DEBUG all=n
 
 #-
 #- *** FILE: drivers/scsi/osd/Kconfig ***
@@ -3435,8 +3534,14 @@ B3DFG all=m
 COMEDI all=m ppc=n
 COMEDI_DEBUG all=n
 COMEDI_PCI_DRIVERS all=m
+COMEDI_PCMCIA_DRIVERS all=m
 COMEDI_USB_DRIVERS all=m
 
+#-
+#- *** FILE: drivers/staging/cpc-usb/Kconfig ***
+#-
+USB_CPC all=m
+
 #-
 #- *** FILE: drivers/staging/dst/Kconfig ***
 #-
@@ -3524,6 +3629,11 @@ PANEL_PARPORT all=0
 PANEL_PROFILE all=5
 PANEL_CHANGE_MESSAGE all=n
 
+#-
+#- *** FILE: drivers/staging/pata_rdc/Kconfig ***
+#-
+RDC_17F3101X all=m
+
 #-
 #- *** FILE: drivers/staging/phison/Kconfig ***
 #-
@@ -3561,6 +3671,16 @@ RT3070 all=m
 #-
 RTL8187SE all=m
 
+#-
+#- *** FILE: drivers/staging/rtl8192su/Kconfig ***
+#-
+RTL8192SU all=m
+
+#-
+#- *** FILE: drivers/staging/serqt_usb2/Kconfig ***
+#-
+USB_SERIAL_QUATECH2 all=m
+
 #-
 #- *** FILE: drivers/staging/slicoss/Kconfig ***
 #-
@@ -3576,6 +3696,11 @@ STLC45XX all=m
 #-
 SXG all=m
 
+#-
+#- *** FILE: drivers/staging/udlfb/Kconfig ***
+#-
+FB_UDL all=m
+
 #-
 #- *** FILE: drivers/staging/usbip/Kconfig ***
 #-
@@ -3583,6 +3708,11 @@ USB_IP_COMMON all=m
 USB_IP_VHCI_HCD all=m
 USB_IP_HOST all=m
 
+#-
+#- *** FILE: drivers/staging/vt6655/Kconfig ***
+#-
+VT6655 all=m
+
 #-
 #- *** FILE: drivers/staging/winbond/Kconfig ***
 #-
@@ -3695,10 +3825,12 @@ USB_GADGET_CI13XXX all=n
 USB_GADGET_NET2280 all=y sparc64=n
 USB_NET2280 all=m
 USB_GADGET_GOKU all=n
+USB_GADGET_LANGWELL all=n
 USB_GADGET_DUMMY_HCD all=n
 USB_GADGET_DUALSPEED all=y
 USB_ZERO all=m
 USB_ZERO_HNPTEST all=n
+USB_AUDIO all=m
 USB_ETH all=m
 USB_ETH_RNDIS all=y
 USB_GADGETFS all=m
@@ -3714,6 +3846,8 @@ USB_CDC_COMPOSITE all=m
 #-
 #- USB Host Controller Drivers
 USB_C67X00_HCD all=m
+USB_XHCI_HCD all=m
+USB_XHCI_HCD_DEBUGGING all=n
 USB_EHCI_HCD all=m
 USB_EHCI_ROOT_HUB_TT all=y sparc64=n
 USB_EHCI_TT_NEWSCHED all=y
@@ -4209,6 +4343,7 @@ FS_POSIX_ACL all=y
 #- file fs/autofs/Kconfig goes here
 #- file fs/autofs4/Kconfig goes here
 #- file fs/fuse/Kconfig goes here
+CUSE all=m
 GENERIC_ACL all=y
 #- file fs/fscache/Kconfig goes here
 #- file fs/cachefiles/Kconfig goes here
@@ -4526,6 +4661,7 @@ NFS_FS all=m
 NFS_V3 all=y
 NFS_V3_ACL all=y
 NFS_V4 all=y
+NFS_V4_1 all=n
 NFS_FSCACHE all=y
 
 #-
@@ -4812,6 +4948,8 @@ SIGNALFD all=y
 TIMERFD all=y
 EVENTFD all=y
 SHMEM all=y
+PERF_COUNTERS all=y
+EVENT_PROFILE all=y
 VM_EVENT_COUNTERS all=y
 STRIP_ASM_SYMS all=y
 COMPAT_BRK all=n
@@ -4849,6 +4987,11 @@ PREEMPT_NONE all=n sparc64=y
 PREEMPT_VOLUNTARY all=y sparc64=n
 PREEMPT all=n
 
+#-
+#- *** FILE: kernel/gcov/Kconfig ***
+#-
+GCOV_KERNEL all=n
+
 #-
 #- *** FILE: kernel/power/Kconfig ***
 #-
@@ -4873,13 +5016,18 @@ HIGH_RES_TIMERS all=y alpha= ia64=
 #- *** FILE: kernel/trace/Kconfig ***
 #-
 CONTEXT_SWITCH_TRACER all=n
+FTRACE all=y
 FUNCTION_TRACER all=n
 IRQSOFF_TRACER all=n
 SYSPROF_TRACER all=n
 SCHED_TRACER all=n
+ENABLE_DEFAULT_TRACERS all=n
 FTRACE_SYSCALLS all=n
 BOOT_TRACER all=n
 TRACE_BRANCH_PROFILING all=n
+BRANCH_PROFILE_NONE all=y
+PROFILE_ANNOTATED_BRANCHES all=n
+PROFILE_ALL_BRANCHES all=n
 POWER_TRACER all=n
 STACK_TRACER all=n
 HW_BRANCH_TRACER all=n
@@ -4887,6 +5035,7 @@ KMEMTRACE all=n
 WORKQUEUE_TRACER all=n
 BLK_DEV_IO_TRACE all=n
 FTRACE_STARTUP_TEST all=n
+RING_BUFFER_BENCHMARK all=m
 
 #-
 #- *** FILE: lib/Kconfig ***
@@ -4941,6 +5090,7 @@ DEBUG_OBJECTS all=n
 DEBUG_SLAB all=n
 SLUB_DEBUG_ON all=n
 SLUB_STATS all=n
+DEBUG_KMEMLEAK all=n
 DEBUG_RT_MUTEXES all=n
 RT_MUTEX_TESTER all=n
 DEBUG_SPINLOCK all=n
@@ -4986,6 +5136,11 @@ DMA_API_DEBUG all=n
 #-
 KGDB all=n
 
+#-
+#- *** FILE: lib/Kconfig.kmemcheck ***
+#-
+KMEMCHECK all=n
+
 #-
 #- *** FILE: mm/Kconfig ***
 #-
@@ -5195,6 +5350,11 @@ ECONET all=m
 ECONET_AUNUDP all=y
 ECONET_NATIVE all=y
 
+#-
+#- *** FILE: net/ieee802154/Kconfig ***
+#-
+IEEE802154 all=m
+
 #-
 #- *** FILE: net/ipv4/Kconfig ***
 #-
@@ -5328,6 +5488,7 @@ LLC2 all=m
 #-
 MAC80211 all=m sparc=n
 #- CFG80211 needs to be enabled for MAC80211
+MAC80211_DEFAULT_PS all=y
 MAC80211_RC_MINSTREL all=y
 MAC80211_RC_DEFAULT_MINSTREL all=y
 MAC80211_MESH all=y
@@ -5345,6 +5506,7 @@ NETFILTER_XT_MATCH_IPRANGE 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
 
 #-
@@ -5508,6 +5670,7 @@ WIMAX_DEBUG_LEVEL all=8
 #-
 CFG80211 all=m sparc=n
 CFG80211_REG_DEBUG all=n
+CFG80211_DEBUGFS all=n
 WIRELESS_OLD_REGULATORY all=y
 WIRELESS_EXT all=y
 WIRELESS_EXT_SYSFS all=y
@@ -5546,6 +5709,7 @@ SECURITY_NETWORK all=y
 SECURITY_NETWORK_XFRM all=y
 SECURITY_PATH all=y
 SECURITY_FILE_CAPABILITIES all=y
+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
@@ -5772,6 +5936,7 @@ 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_CTXFI all=m
 SND_DARLA20 all=m
 SND_GINA20 all=m
 SND_LAYLA20 all=m
@@ -5805,6 +5970,7 @@ SND_ICE1724 all=m
 SND_INTEL8X0 all=m sparc=n
 SND_INTEL8X0M all=m sparc=m
 SND_KORG1212 all=m
+SND_LX6464ES all=m
 SND_MAESTRO3 all=m
 SND_MIXART all=m
 SND_NM256 all=m
@@ -5829,6 +5995,7 @@ SND_HDA_INTEL all=m sparc=n
 SND_HDA_HWDEP all=y
 SND_HDA_RECONFIG all=n
 SND_HDA_INPUT_BEEP all=y
+SND_HDA_INPUT_JACK all=y
 SND_HDA_CODEC_REALTEK all=y
 SND_HDA_CODEC_ANALOG all=y
 SND_HDA_CODEC_SIGMATEL all=y
@@ -5837,6 +6004,7 @@ SND_HDA_CODEC_ATIHDMI all=y
 SND_HDA_CODEC_NVHDMI all=y
 SND_HDA_CODEC_INTELHDMI all=y
 SND_HDA_CODEC_CONEXANT all=y
+SND_HDA_CODEC_CA0110 all=y
 SND_HDA_CODEC_CMEDIA all=y
 SND_HDA_CODEC_SI3054 all=y
 SND_HDA_GENERIC all=y

diff --git a/kernel-x86.config b/kernel-x86.config
index 20f66cc01691ba35a051cac2c3adabb7f53b3091..30f4db08d39674d904c3363fbc970120bbb968cf 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -5,6 +5,7 @@
 OPROFILE x86=m
 OPROFILE_IBS x86=n
 KPROBES x86=y
+#- file kernel/gcov/Kconfig goes here
 
 #-
 #- *** FILE: arch/x86/Kconfig ***
@@ -15,22 +16,18 @@ KPROBES x86=y
 #- file kernel/time/Kconfig goes here
 SMP x86=y
 SPARSE_IRQ i386=y x86_64=y
-NUMA_MIGRATE_IRQ_DESC i386=y x86_64=y
 X86_MPPARSE i386=y x86_64=n
+X86_BIGSMP i386=y
 X86_EXTENDED_PLATFORM i386=y x86_64=y
-X86_32_NON_STANDARD i386=y
-X86_PC x86=y
+X86_VSMP x86_64=n
+X86_UV i386=n x86_64=n
 X86_ELAN i386=n
-X86_VOYAGER i386=n
-X86_GENERICARCH i386=n
+X86_RDC321X i386=n
+X86_32_NON_STANDARD i386=y
 X86_NUMAQ i386=n
+X86_VISWS i386=n
 X86_SUMMIT i386=n
 X86_ES7000 i386=n
-X86_BIGSMP i386=y
-X86_VSMP x86_64=n
-X86_UV i386=n x86_64=n
-X86_VISWS i386=n
-X86_RDC321X i386=n
 SCHED_OMIT_FRAME_POINTER i386=y x86_64=y
 PARAVIRT_GUEST x86=n
 #- file arch/x86/xen/Kconfig goes here
@@ -57,6 +54,7 @@ X86_MCE_INTEL x86_64=y
 X86_MCE_AMD x86_64=y
 X86_MCE_NONFATAL i386=m
 X86_MCE_P4THERMAL i386=y
+X86_OLD_MCE i386=n
 VM86 i386=y
 TOSHIBA i386=m
 I8K x86=m
@@ -139,7 +137,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
@@ -188,7 +185,6 @@ EARLY_PRINTK x86=y
 EARLY_PRINTK_DBGP x86=n
 DEBUG_STACKOVERFLOW x86=n
 DEBUG_STACK_USAGE x86=n
-DEBUG_PAGEALLOC x86=n
 DEBUG_PER_CPU_MAPS x86=n
 X86_PTDUMP x86=n
 DEBUG_NX_TEST x86=m
@@ -211,7 +207,6 @@ X86_ACPI_CPUFREQ x86=m
 X86_POWERNOW_K6 i386=m
 X86_POWERNOW_K7 i386=m
 X86_POWERNOW_K8 x86=m
-X86_POWERNOW_K8_ACPI x86=y
 X86_GX_SUSPMOD i386=m
 X86_SPEEDSTEP_CENTRINO x86=m
 X86_SPEEDSTEP_CENTRINO_TABLE i386=y
@@ -233,7 +228,6 @@ KVM x86=m
 KVM_INTEL x86=m
 KVM_AMD x86=m
 KVM_TRACE all=n
-
 #- file drivers/lguest/Kconfig goes here
 #- file drivers/virtio/Kconfig goes here
 
@@ -252,11 +246,21 @@ X86_PLATFORM_DEVICES i386=y x86_64=y
 #-
 MMIOTRACE x86=n
 
+#-
+#- *** FILE: mm/Kconfig.debug ***
+#-
+DEBUG_PAGEALLOC x86=n
+
 #-
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
 APM_REAL_MODE_POWER_OFF i386=y
 IRQBALANCE i386=n
 MWINCHIP2 i386=n
+NUMA_MIGRATE_IRQ_DESC i386=y x86_64=y
 SCHED_NO_NO_OMIT_FRAME_POINTER i386=y
 X86_ACPI_CPUFREQ_PROC_INTF i386=y x86_64=n
+X86_GENERICARCH i386=n
+X86_PC x86=y
+X86_POWERNOW_K8_ACPI x86=y
+X86_VOYAGER i386=n