summaryrefslogtreecommitdiffstats
path: root/config-debug
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2010-12-09 13:52:05 -0500
committerKyle McMartin <kyle@redhat.com>2010-12-09 13:52:05 -0500
commiteae11717a184705aad08a3783cba964bfa3a06dd (patch)
tree1eea57a2c772ec5b31389a2ef568056b48b4c75e /config-debug
parent72b3729657a0c46f187e4a6c500b239a0e4d391a (diff)
parentcbb00197b664276f98b22d0531c342231d4d6ae0 (diff)
Merge branch 'kernel-git'
Diffstat (limited to 'config-debug')
-rw-r--r--config-debug6
1 files changed, 5 insertions, 1 deletions
diff --git a/config-debug b/config-debug
index 44144536..5366a846 100644
--- a/config-debug
+++ b/config-debug
@@ -74,6 +74,7 @@ CONFIG_DEBUG_CFQ_IOSCHED=y
CONFIG_DRBD_FAULT_INJECTION=y
CONFIG_ATH_DEBUG=y
+CONFIG_CARL9170_DEBUGFS=y
CONFIG_IWLWIFI_DEVICE_TRACING=y
CONFIG_DEBUG_OBJECTS_WORK=y
@@ -84,7 +85,7 @@ CONFIG_DMADEVICES_VDEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
-CONFIG_CEPH_FS_PRETTYDEBUG=y
+CONFIG_CEPH_LIB_PRETTYDEBUG=y
CONFIG_QUOTA_DEBUG=y
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
@@ -93,3 +94,6 @@ CONFIG_PCI_DEFAULT_USE_CRS=y
CONFIG_KGDB_KDB=y
CONFIG_KDB_KEYBOARD=y
+
+CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
+CONFIG_TEST_LIST_SORT=y