summaryrefslogtreecommitdiffstats
path: root/config-debug
diff options
context:
space:
mode:
authorAdam Williamson <awilliam@redhat.com>2014-11-08 14:59:30 -0800
committerAdam Williamson <awilliam@redhat.com>2014-11-08 14:59:30 -0800
commit89b19396f6c5dd09eaf8f44bcee27d42a2da1502 (patch)
tree317c2721f3a641d3a9308c512532bfb384a4df06 /config-debug
parentc2e2a0849b034d919e0c2e27c36d77697579eb6b (diff)
parentb1223bfd6a6dd0bec9b3c0df7b286b22bcc35257 (diff)
downloadkernel-89b19396f6c5dd09eaf8f44bcee27d42a2da1502.tar.gz
kernel-89b19396f6c5dd09eaf8f44bcee27d42a2da1502.tar.xz
kernel-89b19396f6c5dd09eaf8f44bcee27d42a2da1502.zip
Merge branch 'master' into baytrail (3.18 bump)
Diffstat (limited to 'config-debug')
-rw-r--r--config-debug4
1 files changed, 0 insertions, 4 deletions
diff --git a/config-debug b/config-debug
index d866d8013..467f33a19 100644
--- a/config-debug
+++ b/config-debug
@@ -31,14 +31,12 @@ CONFIG_LOCK_STAT=y
CONFIG_DEBUG_STACK_USAGE=y
CONFIG_ACPI_DEBUG=y
-# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
CONFIG_DEBUG_SG=y
CONFIG_DEBUG_PI_LIST=y
# CONFIG_DEBUG_PAGEALLOC is not set
-CONFIG_DEBUG_WRITECOUNT=y
CONFIG_DEBUG_OBJECTS=y
# CONFIG_DEBUG_OBJECTS_SELFTEST is not set
CONFIG_DEBUG_OBJECTS_FREE=y
@@ -53,7 +51,6 @@ CONFIG_CAN_DEBUG_DEVICES=y
CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
CONFIG_DEBUG_NOTIFIERS=y
@@ -97,7 +94,6 @@ CONFIG_PM_ADVANCED_DEBUG=y
CONFIG_CEPH_LIB_PRETTYDEBUG=y
CONFIG_QUOTA_DEBUG=y
-CONFIG_PCI_DEFAULT_USE_CRS=y
CONFIG_KGDB_KDB=y
CONFIG_KDB_KEYBOARD=y