[patch] diff config-2.6.30 config-2.6.31

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

--- config-2.6.30.x	2009-12-04 00:32:33.000000000 +0300
+++ config-2.6.31.x	2009-12-04 00:32:27.000000000 +0300
@@ -73,6 +73,7 @@
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_MD=m
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_RAM_COUNT=1
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_SIZE=4096
@@ -130,12 +131,12 @@
 CONFIG_CLS_U32_PERF=y
 CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
-CONFIG_COMPAT_NET_DEV_OPS=y
 CONFIG_COMPAT_VDSO=y
 CONFIG_COMPAT=y
 CONFIG_CONFIGFS_FS=m
 CONFIG_CONNECTOR=m
 CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_CONSTRUCTORS=y
 CONFIG_CPU5_WDT=m
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
@@ -162,6 +163,8 @@
 CONFIG_CRYPTO_AEAD2=m
 CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_AES_X86_64=m
 CONFIG_CRYPTO_ALGAPI2=m
 CONFIG_CRYPTO_ALGAPI=m
 CONFIG_CRYPTO_ANSI_CPRNG=m
@@ -186,6 +189,7 @@
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_FIPS=y
+CONFIG_CRYPTO_FPU=m
 CONFIG_CRYPTO_GCM=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HASH2=m
@@ -209,6 +213,7 @@
 CONFIG_CRYPTO_RNG2=m
 CONFIG_CRYPTO_RNG=m
 CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SEQIV=m
 CONFIG_CRYPTO_SERPENT=m
@@ -220,12 +225,14 @@
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
 CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_X86_64=m
 CONFIG_CRYPTO_WORKQUEUE=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
 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
@@ -249,8 +256,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_ZERO=m
 CONFIG_DNOTIFY=y
@@ -291,6 +301,7 @@
 CONFIG_FIB_RULES=y
 CONFIG_FILE_LOCKING=y
 CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_OHCI_DEBUG=y
 CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
@@ -303,6 +314,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
@@ -334,14 +346,17 @@
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_KMEMCHECK=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_CPUMASK_OF_CPU_MAP=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
@@ -360,6 +375,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
@@ -368,7 +384,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
@@ -380,10 +398,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_HIGH_RES_TIMERS=y
 CONFIG_HOTPLUG_CPU=y
 CONFIG_HOTPLUG=y
@@ -526,6 +547,7 @@
 CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_SCTP=m
 CONFIG_ISA_DMA_API=y
+CONFIG_ISCSI_TCP=m
 CONFIG_ISO9660_FS=m
 CONFIG_IT8712F_WDT=m
 CONFIG_IT87_WDT=m
@@ -640,6 +662,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
@@ -789,6 +812,7 @@
 CONFIG_NO_HZ=y
 CONFIG_NR_CPUS=4
 CONFIG_NVRAM=m
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
 CONFIG_PACKET=m
 CONFIG_PACKET_MMAP=y
 CONFIG_PAGEFLAGS_EXTENDED=y
@@ -803,16 +827,20 @@
 CONFIG_PCF8575=m
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEPORTBUS=y
 CONFIG_PCI_LEGACY=y
 CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_MSI=y
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_PCI_QUIRKS=y
 CONFIG_PCI=y
 CONFIG_PCSPKR_PLATFORM=y
+CONFIG_PERF_COUNTERS=y
 CONFIG_PHYLIB=m
 CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_PHYSICAL_ALIGN=0x200000
-CONFIG_PHYSICAL_START=0x200000
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_SLEEP=y
 CONFIG_PM=y
@@ -871,6 +899,7 @@
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_RX8025=m
 CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_STK17TA8=m
 CONFIG_RTC_DRV_V3020=m
@@ -896,11 +925,13 @@
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SCHED_SMT=y
-CONFIG_SCSI_DH=m
-CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DMA=y
+CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_SCSI=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
 CONFIG_SCSI_PROC_FS=y
 CONFIG_SCSI_TGT=m
 CONFIG_SCSI_WAIT_SCAN=m
@@ -961,7 +992,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
@@ -972,6 +1002,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
@@ -1034,6 +1065,7 @@
 CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_ECHO3G=m
 CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_EMU10K1X=m
 CONFIG_SND_ENS1370=m
 CONFIG_SND_ENS1371=m
@@ -1044,6 +1076,7 @@
 CONFIG_SND_GINA24=m
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_ATIHDMI=y
+CONFIG_SND_HDA_CODEC_CA0110=y
 CONFIG_SND_HDA_CODEC_CMEDIA=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_INTELHDMI=y
@@ -1054,6 +1087,7 @@
 CONFIG_SND_HDA_CODEC_VIA=y
 CONFIG_SND_HDA_ELD=y
 CONFIG_SND_HDA_GENERIC=y
+CONFIG_SND_HDA_INPUT_JACK=y
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
@@ -1082,6 +1116,7 @@
 CONFIG_SND_MPU401_UART=m
 CONFIG_SND_NM256=m
 CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
 CONFIG_SND_OSSEMUL=y
 CONFIG_SND_OXYGEN_LIB=m
 CONFIG_SND_OXYGEN=m
@@ -1091,6 +1126,7 @@
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCXHR=m
 CONFIG_SND_RAWMIDI=m
+CONFIG_SND_RAWMIDI_SEQ=m
 CONFIG_SND_RIPTIDE=m
 CONFIG_SND_RME32=m
 CONFIG_SND_RME9652=m
@@ -1120,6 +1156,8 @@
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_SPARSEMEM=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_SQUASHFS=m
 CONFIG_SSB_POSSIBLE=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_STANDALONE=y
@@ -1169,7 +1207,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
@@ -1194,6 +1231,7 @@
 CONFIG_USB_STORAGE=m
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_XHCI_HCD=m
 CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_USER_SCHED=y
 CONFIG_USER_STACKTRACE_SUPPORT=y
@@ -1225,7 +1263,6 @@
 CONFIG_W83977F_WDT=m
 CONFIG_WAFER_WDT=m
 CONFIG_WATCHDOG=y
-CONFIG_WDT_501_PCI=y
 CONFIG_WDTPCI=m
 CONFIG_X86_64_SMP=y
 CONFIG_X86_64=y
@@ -1250,10 +1287,12 @@
 CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_X86_MPPARSE=y
 CONFIG_X86_MSR=m
+CONFIG_X86_NEW_MCE=y
 CONFIG_X86_P6_NOP=y
 CONFIG_X86_PAT=y
 CONFIG_X86_PM_TIMER=y
 CONFIG_X86_RESERVE_LOW_64K=y
+CONFIG_X86_THERMAL_VECTOR=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_TSC=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y