diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-06-10 10:03:17 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-06-10 10:03:17 +0200 |
| commit | e2a16d6f70ee68b101ea7132fb8a547a7141f30a (patch) | |
| tree | 5f7e9525d3454654420811808cefda0893771d9f /kernel-armv7hl-debug.config | |
| parent | 9af44674b5879aa92dba618b909bc2ab08885266 (diff) | |
| parent | e15b9f28bb9eba2b3791c0d8edbec1e534e0d1a9 (diff) | |
| download | kernel-4.12.0-0.rc4.git3.1.vanilla.knurd.1.fc26.tar.gz kernel-4.12.0-0.rc4.git3.1.vanilla.knurd.1.fc26.tar.xz kernel-4.12.0-0.rc4.git3.1.vanilla.knurd.1.fc26.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc4.git3.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc4.git3.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc4.git3.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc4.git3.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-armv7hl-debug.config')
| -rw-r--r-- | kernel-armv7hl-debug.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index a765d4402..edfd318bd 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4579,7 +4579,7 @@ CONFIG_REGMAP_SPI=y CONFIG_REGMAP_SPMI=m CONFIG_REGMAP=y # CONFIG_REGULATOR_88PM800 is not set -# CONFIG_REGULATOR_ACT8865 is not set +CONFIG_REGULATOR_ACT8865=m CONFIG_REGULATOR_AD5398=m CONFIG_REGULATOR_ANATOP=m CONFIG_REGULATOR_AS3722=m @@ -4677,7 +4677,7 @@ CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m CONFIG_ROCKCHIP_ANALOGIX_DP=y -# CONFIG_ROCKCHIP_CDN_DP is not set +CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DW_HDMI=y CONFIG_ROCKCHIP_DW_MIPI_DSI=y CONFIG_ROCKCHIP_EFUSE=m |