summaryrefslogtreecommitdiff
path: root/libre/kernel26-libre/config.x86_64
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-04-27 19:39:25 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-04-27 19:39:25 -0300
commita3484d36d471110db6eb07c1bcac535fa312a0a4 (patch)
treeae5757a526845753f943a04ab06e34d198aba78d /libre/kernel26-libre/config.x86_64
parent45a1b262edf175ecf5dd43e51c8ee72f9d78265b (diff)
parent8784d3134c1d4b4c02d705259ae2ebd768c778fd (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/addresses/PKGBUILD community-testing/gcc-avr/PKGBUILD community-testing/gnumail/PKGBUILD community-testing/gnustep-back/PKGBUILD community-testing/gnustep-base/PKGBUILD community-testing/gnustep-gui/PKGBUILD community-testing/llvm/PKGBUILD community-testing/systemd/PKGBUILD community/llvm/PKGBUILD community/lua-yajl-git/PKGBUILD community/mingw32-gcc/PKGBUILD community/python-scipy/PKGBUILD community/virtualbox/PKGBUILD core/bin86/PKGBUILD core/cloog-ppl/PKGBUILD core/gcc/PKGBUILD core/mpfr/PKGBUILD extra/ilmbase/PKGBUILD extra/kdeedu/PKGBUILD extra/kdepim/PKGBUILD extra/latex2html/PKGBUILD extra/libmad/PKGBUILD extra/postgresql/PKGBUILD multilib-testing/binutils-multilib/PKGBUILD multilib-testing/gcc-multilib/PKGBUILD multilib-testing/lib32-glibc/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/gcc-multilib/gcc-go.install testing/bin86/PKGBUILD testing/binutils/PKGBUILD testing/coreutils/PKGBUILD testing/glibc/PKGBUILD testing/gnome-control-center/PKGBUILD testing/less/PKGBUILD testing/linux-api-headers/PKGBUILD testing/mdadm/PKGBUILD testing/mpfr/PKGBUILD testing/udev/PKGBUILD
Diffstat (limited to 'libre/kernel26-libre/config.x86_64')
-rw-r--r--libre/kernel26-libre/config.x86_643
1 files changed, 2 insertions, 1 deletions
diff --git a/libre/kernel26-libre/config.x86_64 b/libre/kernel26-libre/config.x86_64
index d98f24533..d89904aa7 100644
--- a/libre/kernel26-libre/config.x86_64
+++ b/libre/kernel26-libre/config.x86_64
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/x86_64 2.6.38 Kernel Configuration
-# Sun Apr 17 14:31:49 2011
+# Fri Apr 22 19:25:29 2011
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -5061,6 +5061,7 @@ CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
CONFIG_HAVE_ARCH_KMEMCHECK=y
# CONFIG_KMEMCHECK is not set
+CONFIG_TEST_KSTRTOX=m
CONFIG_STRICT_DEVMEM=y
CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_EARLY_PRINTK=y