diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-10-05 09:35:25 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-10-05 09:35:25 +0000 |
| commit | 4c7f0cd5b3f49cea58da9d6efcaf5099a86f6b1c (patch) | |
| tree | d09a34d097fa182d3e7762fe13168b9414cc5f27 /main/linux-grsec/kernelconfig.x86 | |
| parent | a33599ccc3f96453286173267a61016b08f48d52 (diff) | |
| download | aports-4c7f0cd5b3f49cea58da9d6efcaf5099a86f6b1c.tar.bz2 aports-4c7f0cd5b3f49cea58da9d6efcaf5099a86f6b1c.tar.xz | |
main/linux-grsec: upgrade to grsecurity-2.2.0-2.6.32.24-201010021153
Diffstat (limited to 'main/linux-grsec/kernelconfig.x86')
| -rw-r--r-- | main/linux-grsec/kernelconfig.x86 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index ec5f8db34..888818701 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.16 -# Thu Aug 12 15:19:19 2010 +# Linux kernel version: 2.6.32.24 +# Tue Oct 5 09:05:07 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 @@ -506,7 +507,6 @@ CONFIG_HOTPLUG_PCI_SHPC=m CONFIG_BINFMT_ELF=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_HAVE_AOUT=y -CONFIG_BINFMT_AOUT=m CONFIG_BINFMT_MISC=m CONFIG_HAVE_ATOMIC_IOMAP=y CONFIG_NET=y @@ -659,6 +659,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_GRADM=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m @@ -3055,6 +3056,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 @@ -3110,6 +3113,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 |