summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-01-07 10:55:00 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-01-07 10:55:00 -0500
commit52fd119334f2c44e5db48a494e8cc5a0cbb60b1b (patch)
tree7b19a73a7b2d6c549e5a03e72dbc8e3120da9b76 /config-generic
parentdd6834d028ed696e10a3a6ff4fdc388c7b0bf4b0 (diff)
downloadkernel-52fd119334f2c44e5db48a494e8cc5a0cbb60b1b.tar.gz
kernel-52fd119334f2c44e5db48a494e8cc5a0cbb60b1b.tar.xz
kernel-52fd119334f2c44e5db48a494e8cc5a0cbb60b1b.zip
Linux v3.19-rc3-38-gbdec41963890
- Enable POWERCAP and INTEL_RAPL options - Reenable debugging options.
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic8
1 files changed, 4 insertions, 4 deletions
diff --git a/config-generic b/config-generic
index 596118f62..58450cb30 100644
--- a/config-generic
+++ b/config-generic
@@ -1710,13 +1710,13 @@ CONFIG_B43_PCMCIA=y
CONFIG_B43_SDIO=y
CONFIG_B43_BCMA=y
CONFIG_B43_BCMA_PIO=y
-# CONFIG_B43_DEBUG is not set
+CONFIG_B43_DEBUG=y
CONFIG_B43_PHY_LP=y
CONFIG_B43_PHY_N=y
CONFIG_B43_PHY_HT=y
CONFIG_B43_PHY_G=y
CONFIG_B43LEGACY=m
-# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DEBUG=y
CONFIG_B43LEGACY_DMA=y
CONFIG_B43LEGACY_PIO=y
CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -4742,7 +4742,7 @@ CONFIG_PM_DEBUG=y
# CONFIG_DPM_WATCHDOG is not set # revisit this in debug
CONFIG_PM_TRACE=y
CONFIG_PM_TRACE_RTC=y
-# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_TEST_SUSPEND=y
CONFIG_PM_RUNTIME=y
# CONFIG_PM_OPP is not set
# CONFIG_PM_AUTOSLEEP is not set
@@ -5299,7 +5299,7 @@ CONFIG_FMC_CHARDEV=m
# CONFIG_GENWQE is not set
-# CONFIG_POWERCAP is not set
+CONFIG_POWERCAP=y
# CONFIG_THUNDERBOLT is not set
# CONFIG_HSI is not set