[patch] diff config-2.6.30 config-2.6.31 for x86

config.diff (text/plain), 4.68 KB, created by Sergey Belyashov on 2009-12-03 21:41:50 UTC

--- config-2.6.30	2009-12-04 00:39:40.000000000 +0300
+++ config-2.6.31	2009-12-04 00:39:48.000000000 +0300
@@ -122,10 +122,10 @@
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_CLS_U32_MARK=y
 CONFIG_CLS_U32_PERF=y
-CONFIG_COMPAT_NET_DEV_OPS=y
 CONFIG_CONFIGFS_FS=m
 CONFIG_CONNECTOR=m
 CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_CONSTRUCTORS=y
 CONFIG_CPU5_WDT=m
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
@@ -212,6 +212,7 @@
 CONFIG_CRYPTO_XTS=m
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZLIB=m
+CONFIG_CUSE=m
 CONFIG_DCA=m
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_MEMORY_INIT=y
@@ -234,8 +235,11 @@
 CONFIG_DM_DELAY=m
 CONFIG_DMIID=y
 CONFIG_DMI=y
+CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_ZERO=m
@@ -289,6 +293,7 @@
 CONFIG_FSCACHE=m
 CONFIG_FSCACHE_STATS=y
 CONFIG_FS_MBCACHE=m
+CONFIG_FSNOTIFY=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_FUSE_FS=m
 CONFIG_FUTEX=y
@@ -317,14 +322,17 @@
 CONFIG_HAS_IOPORT=y
 CONFIG_HAVE_AOUT=y
 CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_KMEMCHECK=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_ATOMIC_IOMAP=y
 CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_FTRACE_SYSCALLS=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
 CONFIG_HAVE_FUNCTION_TRACER=y
@@ -343,6 +351,7 @@
 CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_PERF_COUNTERS=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_HID_A4TECH=m
@@ -351,7 +360,9 @@
 CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
 CONFIG_HID_EZKEY=m
+CONFIG_HID_GREENASIA=m
 CONFIG_HID_GYRATION=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KYE=m
@@ -363,10 +374,13 @@
 CONFIG_HID_PANTHERLORD=m
 CONFIG_HID_PETALYNX=m
 CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SMARTJOYPLUS=m
 CONFIG_HID_SONY=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_SUPPORT=y
+CONFIG_HID_THRUSTMASTER=m
 CONFIG_HID_TOPSEED=m
+CONFIG_HID_ZEROPLUS=m
 CONFIG_HIGHMEM4G=y
 CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
@@ -512,7 +526,7 @@
 CONFIG_KEXEC=y
 CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KTIME_SCALAR=y
-CONFIG_LBD=y
+CONFIG_LBDAF=y
 CONFIG_LEDS_CLASS=m
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -527,9 +541,9 @@
 CONFIG_LOG_BUF_SHIFT=15
 CONFIG_LZO_COMPRESS=m
 CONFIG_LZO_DECOMPRESS=m
+CONFIG_MAC80211_DEFAULT_PS_VALUE=0
 CONFIG_MAC80211_LEDS=y
 CONFIG_MAC80211=m
-CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_RC_DEFAULT="minstrel"
 CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_MINSTREL=y
@@ -619,6 +633,7 @@
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
@@ -767,6 +782,7 @@
 CONFIG_NO_HZ=y
 CONFIG_NR_CPUS=1
 CONFIG_NVRAM=m
+CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_PACKET=m
 CONFIG_PACKET_MMAP=y
 CONFIG_PAGEFLAGS_EXTENDED=y
@@ -790,8 +806,9 @@
 CONFIG_PCI=y
 CONFIG_PCSPKR_PLATFORM=y
 CONFIG_PCWATCHDOG=m
+CONFIG_PERF_COUNTERS=y
 CONFIG_PHYSICAL_ALIGN=0x100000
-CONFIG_PHYSICAL_START=0x100000
+CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PM_SLEEP=y
 CONFIG_PM=y
 CONFIG_PNPACPI=y
@@ -847,6 +864,7 @@
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_RX8025=m
 CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_STK17TA8=m
@@ -936,7 +954,6 @@
 CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6875=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCA9539=m
@@ -947,6 +964,7 @@
 CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP401=m
 CONFIG_SENSORS_TSL2550=m
 CONFIG_SENSORS_VIA686A=m
 CONFIG_SENSORS_VT1211=m
@@ -1029,7 +1047,6 @@
 CONFIG_UDF_NLS=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_UID16=y
-CONFIG_UNEVICTABLE_LRU=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX=m
 CONFIG_USB_ACM=m
@@ -1095,7 +1112,6 @@
 CONFIG_W83977F_WDT=m
 CONFIG_WAFER_WDT=m
 CONFIG_WATCHDOG=y
-CONFIG_WDT_501_PCI=y
 CONFIG_WDT=m
 CONFIG_WDTPCI=m
 CONFIG_WIRELESS_EXT_SYSFS=y
@@ -1120,11 +1136,13 @@
 CONFIG_X86_L1_CACHE_BYTES=64
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_MCE_NONFATAL=m
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
 CONFIG_X86_MCE=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=4
 CONFIG_X86_MPPARSE=y
 CONFIG_X86_MSR=m
+CONFIG_X86_NEW_MCE=y
 CONFIG_X86_PAT=y
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_X86_PM_TIMER=y