diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2010-06-19 09:05:29 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2010-06-19 09:05:29 +0000 |
| commit | cd39cdcaac4bb080e939cd79288a3fa626528f7f (patch) | |
| tree | 9ff9f55a84f988b8095d02240e74ae91eddd3e24 /main/linux-grsec/kernelconfig.x86 | |
| parent | 85fd77589be2f6c970ca6895afa1520e0a2fda04 (diff) | |
| parent | bf31029cd1255d11b787a857a103139ddbe2b29d (diff) | |
| download | aports-cd39cdcaac4bb080e939cd79288a3fa626528f7f.tar.bz2 aports-cd39cdcaac4bb080e939cd79288a3fa626528f7f.tar.xz | |
Merge remote branch 'alpine/master'
Diffstat (limited to 'main/linux-grsec/kernelconfig.x86')
| -rw-r--r-- | main/linux-grsec/kernelconfig.x86 | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index d70107d29b..5f4cb8c2b4 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.14 -# Wed Jun 2 07:39:39 2010 +# Linux kernel version: 2.6.32.15 +# Wed Jun 16 07:30:34 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4237,8 +4237,24 @@ CONFIG_CIFS_EXPERIMENTAL=y # # Partition Types # -# CONFIG_PARTITION_ADVANCED is not set +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set CONFIG_NLS=m CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=m @@ -4626,7 +4642,7 @@ CONFIG_VIRTIO_BALLOON=m # # Library routines # -CONFIG_BITREVERSE=m +CONFIG_BITREVERSE=y CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_FIND_LAST_BIT=y @@ -4634,7 +4650,7 @@ CONFIG_CRC_CCITT=m CONFIG_CRC16=m CONFIG_CRC_T10DIF=m CONFIG_CRC_ITU_T=m -CONFIG_CRC32=m +CONFIG_CRC32=y CONFIG_CRC7=m CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y |