diff options
Diffstat (limited to 'main/linux-vserver/kernelconfig.x86')
-rw-r--r-- | main/linux-vserver/kernelconfig.x86 | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/main/linux-vserver/kernelconfig.x86 b/main/linux-vserver/kernelconfig.x86 index 477d6620dd..6f4b515bd3 100644 --- a/main/linux-vserver/kernelconfig.x86 +++ b/main/linux-vserver/kernelconfig.x86 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.15-vs2.3.0.36.29.4 -# Wed Jun 16 07:47:05 2010 +# Linux kernel version: 2.6.32.22-vs2.3.0.36.29.6 +# Mon Oct 4 11:59:10 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -54,6 +54,7 @@ CONFIG_X86_HT=y CONFIG_X86_TRAMPOLINE=y CONFIG_X86_32_LAZY_GS=y CONFIG_KTIME_SCALAR=y +CONFIG_ARCH_CPU_PROBE_RELEASE=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_CONSTRUCTORS=y @@ -143,13 +144,10 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y -CONFIG_HAVE_PERF_EVENTS=y # # Kernel Performance Events And Counters # -CONFIG_PERF_EVENTS=y -CONFIG_PERF_COUNTERS=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_PCI_QUIRKS=y # CONFIG_SLUB_DEBUG is not set @@ -233,8 +231,8 @@ CONFIG_PARAVIRT=y CONFIG_PARAVIRT_CLOCK=y # CONFIG_MEMTEST is not set # CONFIG_M386 is not set -# CONFIG_M486 is not set -CONFIG_M586=y +CONFIG_M486=y +# CONFIG_M586 is not set # CONFIG_M586TSC is not set # CONFIG_M586MMX is not set # CONFIG_M686 is not set @@ -263,7 +261,7 @@ CONFIG_X86_CPU=y CONFIG_X86_L1_CACHE_BYTES=64 CONFIG_X86_INTERNODE_CACHE_BYTES=64 CONFIG_X86_CMPXCHG=y -CONFIG_X86_L1_CACHE_SHIFT=5 +CONFIG_X86_L1_CACHE_SHIFT=4 CONFIG_X86_XADD=y # CONFIG_X86_PPRO_FENCE is not set CONFIG_X86_F00F_BUG=y @@ -1079,6 +1077,7 @@ CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y CONFIG_MAC80211_RC_PID=y CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT_PID=y @@ -3075,6 +3074,8 @@ CONFIG_DVB_FIREDTV_INPUT=y # CONFIG_DVB_FE_CUSTOMISE is not set CONFIG_DVB_STB0899=m CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m CONFIG_DVB_CX24110=m CONFIG_DVB_CX24123=m CONFIG_DVB_MT312=m @@ -3130,6 +3131,7 @@ CONFIG_DVB_TUNER_DIB0070=m CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m CONFIG_DVB_LGS8GXX=m CONFIG_DAB=y CONFIG_USB_DABUSB=m |