diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-08-05 08:06:38 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-08-05 08:06:38 +0200 |
| commit | ea2a781a48382a50aaf33c945afb1116f81c40ee (patch) | |
| tree | d22ff66d2e0c02a599bd955df56fb8c4752ee466 /kernel-aarch64.config | |
| parent | fdb006477def1c5781de44ebec621c44cd7ac9e3 (diff) | |
| parent | d43706f9e1db6b19659c4804b1bfcabaaa82df2f (diff) | |
| download | kernel-ea2a781a48382a50aaf33c945afb1116f81c40ee.tar.gz kernel-ea2a781a48382a50aaf33c945afb1116f81c40ee.tar.xz kernel-ea2a781a48382a50aaf33c945afb1116f81c40ee.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.13.0-0.rc3.git4.1.vanilla.knurd.1.fc27kernel-4.13.0-0.rc3.git4.1.vanilla.knurd.1.fc26kernel-4.13.0-0.rc3.git4.1.vanilla.knurd.1.fc25kernel-4.13.0-0.rc3.git4.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-aarch64.config')
| -rw-r--r-- | kernel-aarch64.config | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 2d3d223c3..eaf600cf9 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -4046,7 +4046,7 @@ CONFIG_PINCTRL_MSM8996=y # CONFIG_PINCTRL_MSM8X74 is not set CONFIG_PINCTRL_MSM=y CONFIG_PINCTRL_MVEBU=y -CONFIG_PINCTRL_QCOM_SPMI_PMIC=m +CONFIG_PINCTRL_QCOM_SPMI_PMIC=y # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set CONFIG_PINCTRL_QDF2XXX=y CONFIG_PINCTRL_SINGLE=y @@ -4296,7 +4296,7 @@ CONFIG_REALTEK_AUTOPM=y CONFIG_REALTEK_PHY=m # CONFIG_REFCOUNT_FULL is not set CONFIG_REGMAP_I2C=y -CONFIG_REGMAP_SPMI=m +CONFIG_REGMAP_SPMI=y CONFIG_REGMAP=y CONFIG_REGULATOR_ACT8865=m # CONFIG_REGULATOR_AD5398 is not set @@ -5379,8 +5379,8 @@ CONFIG_SPI_THUNDERX=m CONFIG_SPI_XLP=m CONFIG_SPI=y # CONFIG_SPI_ZYNQMP_GQSPI is not set -CONFIG_SPMI=m -CONFIG_SPMI_MSM_PMIC_ARB=m +CONFIG_SPMI_MSM_PMIC_ARB=y +CONFIG_SPMI=y # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_EMBEDDED is not set CONFIG_SQUASHFS_LZ4=y |