summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.release1
-rw-r--r--config-debug2
-rw-r--r--config-generic1
-rw-r--r--config-nodebug2
-rw-r--r--kernel.spec1
5 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.release b/Makefile.release
index 293fe583e..3eba9dbac 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -72,6 +72,7 @@ config-release:
@perl -pi -e 's/CONFIG_MAC80211_MESSAGE_TRACING=y/# CONFIG_MAC80211_MESSAGE_TRACING is not set/' config-nodebug
@perl -pi -e 's/CONFIG_XFS_WARN=y/# CONFIG_XFS_WARN is not set/' config-nodebug
@perl -pi -e 's/CONFIG_EDAC_DEBUG=y/# CONFIG_EDAC_DEBUG is not set/' config-nodebug
+ @perl -pi -e 's/CONFIG_RTLWIFI_DEBUG=y/# CONFIG_RTLWIFI_DEBUG is not set/' config-nodebug
@# Undo anything that make extremedebug might have set
@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-debug
diff --git a/config-debug b/config-debug
index ab3f68a5d..5df2cd620 100644
--- a/config-debug
+++ b/config-debug
@@ -84,6 +84,8 @@ CONFIG_ATH_DEBUG=y
CONFIG_CARL9170_DEBUGFS=y
CONFIG_IWLWIFI_DEVICE_TRACING=y
+CONFIG_RTLWIFI_DEBUG=y
+
CONFIG_DEBUG_OBJECTS_WORK=y
CONFIG_DMADEVICES_DEBUG=y
diff --git a/config-generic b/config-generic
index be44f64c7..0a9445a61 100644
--- a/config-generic
+++ b/config-generic
@@ -1678,7 +1678,6 @@ CONFIG_WL1251_SPI=m
CONFIG_WL1251_SDIO=m
CONFIG_RTLWIFI=m
-# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8192CE=m
CONFIG_RTL8192SE=m
CONFIG_RTL8192CU=m
diff --git a/config-nodebug b/config-nodebug
index 5ff12b5bb..58f3f66c7 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -84,6 +84,8 @@ CONFIG_ATH_DEBUG=y
CONFIG_CARL9170_DEBUGFS=y
CONFIG_IWLWIFI_DEVICE_TRACING=y
+CONFIG_RTLWIFI_DEBUG=y
+
CONFIG_DEBUG_OBJECTS_WORK=y
CONFIG_DMADEVICES_DEBUG=y
diff --git a/kernel.spec b/kernel.spec
index ab5bc8428..f53c1353a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2238,6 +2238,7 @@ fi
# || ||
%changelog
* Fri May 10 2013 Josh Boyer <jwboyer@redhat.com>
+- Enable RTLWIFI_DEBUG in debug kernels (rhbz 889425)
- Switch the loop driver to a module and change to doing on-demand creation
(rhbz 896160)
- Disable CRYPTOLOOP as F18 util-linux is the last to support it (rhbz 896160)