diff options
| author | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:29:24 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:29:24 -0500 |
| commit | a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf (patch) | |
| tree | f24c9da1c1927f290aa3d1b640d7fa272860520d /config-nodebug | |
| parent | ee99a68c51ebd08409e45b63796f3c971c27e3d6 (diff) | |
| parent | 98e6119f39d3b83af3b533bed6bcff0e096f2397 (diff) | |
| download | kernel-a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf.tar.gz kernel-a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf.tar.xz kernel-a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf.zip | |
Merge branch 'kernel-git' strategy 'theirs'
Conflicts:
xhci_hcd-suspend-resume.patch
Diffstat (limited to 'config-nodebug')
| -rw-r--r-- | config-nodebug | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/config-nodebug b/config-nodebug index b4472f9a..3f289940 100644 --- a/config-nodebug +++ b/config-nodebug @@ -73,8 +73,9 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 # CONFIG_DRBD_FAULT_INJECTION is not set -# CONFIG_ATH_DEBUG is not set -# CONFIG_IWLWIFI_DEVICE_TRACING is not set +CONFIG_ATH_DEBUG=y +CONFIG_CARL9170_DEBUGFS=y +CONFIG_IWLWIFI_DEVICE_TRACING=y # CONFIG_DEBUG_OBJECTS_WORK is not set # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set @@ -84,8 +85,8 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 CONFIG_PM_ADVANCED_DEBUG=y -# CONFIG_CEPH_FS_PRETTYDEBUG is not set -# CONFIG_QUOTA_DEBUG is not set +CONFIG_CEPH_LIB_PRETTYDEBUG=y +CONFIG_QUOTA_DEBUG=y CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y @@ -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 |