diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-03 15:52:27 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-03 15:52:27 -0500 |
| commit | 9633911b5635f00cb29de62348f874aaaa05274e (patch) | |
| tree | 20a2a7a645e3cd7cae8e65481d7900c0cd2da10a /config-generic | |
| parent | 8ea4731c3887934a789f852eb7fde9a5b50f36d5 (diff) | |
| download | kernel-9633911b5635f00cb29de62348f874aaaa05274e.tar.gz kernel-9633911b5635f00cb29de62348f874aaaa05274e.tar.xz kernel-9633911b5635f00cb29de62348f874aaaa05274e.zip | |
Linux v4.0-rc2
- Enable CONFIG_CM32181 for ALS on Carbon X1
- Disable debugging options.
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config-generic b/config-generic index 18312f26e..178306809 100644 --- a/config-generic +++ b/config-generic @@ -1718,13 +1718,13 @@ CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y CONFIG_B43_BCMA=y CONFIG_B43_BCMA_PIO=y -CONFIG_B43_DEBUG=y +# CONFIG_B43_DEBUG is not set 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=y +# CONFIG_B43LEGACY_DEBUG is not set CONFIG_B43LEGACY_DMA=y CONFIG_B43LEGACY_PIO=y CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y @@ -2690,7 +2690,7 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m # CONFIG_MCP4725 is not set # CONFIG_ITG3200 is not set # CONFIG_APDS9300 is not set -# CONFIG_CM32181 is not set +CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM36651 is not set # CONFIG_GP2AP020A00F is not set @@ -4785,7 +4785,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=y +# CONFIG_PM_TEST_SUSPEND is not set CONFIG_PM_RUNTIME=y # CONFIG_PM_OPP is not set # CONFIG_PM_AUTOSLEEP is not set |