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-debug | |
| parent | 738764956426a09304f07623f75f711a013ef55a (diff) | |
Revert "Merge branch 'kernel-git' strategy 'theirs'"
This reverts commit a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf, reversing
changes made to ee99a68c51ebd08409e45b63796f3c971c27e3d6.
Diffstat (limited to 'config-debug')
| -rw-r--r-- | config-debug | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/config-debug b/config-debug index 5366a846..44144536 100644 --- a/config-debug +++ b/config-debug @@ -74,7 +74,6 @@ 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 @@ -85,7 +84,7 @@ CONFIG_DMADEVICES_VDEBUG=y CONFIG_PM_ADVANCED_DEBUG=y -CONFIG_CEPH_LIB_PRETTYDEBUG=y +CONFIG_CEPH_FS_PRETTYDEBUG=y CONFIG_QUOTA_DEBUG=y # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set @@ -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 |