diff options
| author | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:46:11 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:46:11 -0500 |
| commit | 72b3729657a0c46f187e4a6c500b239a0e4d391a (patch) | |
| tree | 47c746511fa3f4ef828d70bc2011f71d2cec86f1 /config-nodebug | |
| parent | 738764956426a09304f07623f75f711a013ef55a (diff) | |
| download | kernel-72b3729657a0c46f187e4a6c500b239a0e4d391a.tar.gz kernel-72b3729657a0c46f187e4a6c500b239a0e4d391a.tar.xz kernel-72b3729657a0c46f187e4a6c500b239a0e4d391a.zip | |
Revert "Merge branch 'kernel-git' strategy 'theirs'"
This reverts commit a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf, reversing
changes made to ee99a68c51ebd08409e45b63796f3c971c27e3d6.
Diffstat (limited to 'config-nodebug')
| -rw-r--r-- | config-nodebug | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/config-nodebug b/config-nodebug index 3f289940..b4472f9a 100644 --- a/config-nodebug +++ b/config-nodebug @@ -73,9 +73,8 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 # CONFIG_DRBD_FAULT_INJECTION is not set -CONFIG_ATH_DEBUG=y -CONFIG_CARL9170_DEBUGFS=y -CONFIG_IWLWIFI_DEVICE_TRACING=y +# CONFIG_ATH_DEBUG is not set +# CONFIG_IWLWIFI_DEVICE_TRACING is not set # CONFIG_DEBUG_OBJECTS_WORK is not set # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set @@ -85,8 +84,8 @@ CONFIG_IWLWIFI_DEVICE_TRACING=y CONFIG_PM_ADVANCED_DEBUG=y -CONFIG_CEPH_LIB_PRETTYDEBUG=y -CONFIG_QUOTA_DEBUG=y +# CONFIG_CEPH_FS_PRETTYDEBUG is not set +# CONFIG_QUOTA_DEBUG is not set CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y @@ -94,6 +93,3 @@ 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 |