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 /baseconfig | |
parent | fdb006477def1c5781de44ebec621c44cd7ac9e3 (diff) | |
parent | d43706f9e1db6b19659c4804b1bfcabaaa82df2f (diff) | |
download | kernel-4.13.0-0.rc3.git4.1.vanilla.knurd.1.fc25.tar.gz kernel-4.13.0-0.rc3.git4.1.vanilla.knurd.1.fc25.tar.xz kernel-4.13.0-0.rc3.git4.1.vanilla.knurd.1.fc25.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 'baseconfig')
-rw-r--r-- | baseconfig/arm/arm64/CONFIG_PINCTRL_QCOM_SPMI_PMIC | 2 | ||||
-rw-r--r-- | baseconfig/arm/arm64/CONFIG_REGMAP_SPMI | 2 | ||||
-rw-r--r-- | baseconfig/arm/arm64/CONFIG_SPMI | 2 | ||||
-rw-r--r-- | baseconfig/arm/arm64/CONFIG_SPMI_MSM_PMIC_ARB | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_QCOM_SPMI_PMIC b/baseconfig/arm/arm64/CONFIG_PINCTRL_QCOM_SPMI_PMIC index 42b81a044..d24825e16 100644 --- a/baseconfig/arm/arm64/CONFIG_PINCTRL_QCOM_SPMI_PMIC +++ b/baseconfig/arm/arm64/CONFIG_PINCTRL_QCOM_SPMI_PMIC @@ -1 +1 @@ -CONFIG_PINCTRL_QCOM_SPMI_PMIC=m +CONFIG_PINCTRL_QCOM_SPMI_PMIC=y diff --git a/baseconfig/arm/arm64/CONFIG_REGMAP_SPMI b/baseconfig/arm/arm64/CONFIG_REGMAP_SPMI index 0c319596b..eba374b73 100644 --- a/baseconfig/arm/arm64/CONFIG_REGMAP_SPMI +++ b/baseconfig/arm/arm64/CONFIG_REGMAP_SPMI @@ -1 +1 @@ -CONFIG_REGMAP_SPMI=m +CONFIG_REGMAP_SPMI=y diff --git a/baseconfig/arm/arm64/CONFIG_SPMI b/baseconfig/arm/arm64/CONFIG_SPMI index b340c89e6..4ce4dfde9 100644 --- a/baseconfig/arm/arm64/CONFIG_SPMI +++ b/baseconfig/arm/arm64/CONFIG_SPMI @@ -1 +1 @@ -CONFIG_SPMI=m +CONFIG_SPMI=y diff --git a/baseconfig/arm/arm64/CONFIG_SPMI_MSM_PMIC_ARB b/baseconfig/arm/arm64/CONFIG_SPMI_MSM_PMIC_ARB index 813a8d1d9..bd46b497a 100644 --- a/baseconfig/arm/arm64/CONFIG_SPMI_MSM_PMIC_ARB +++ b/baseconfig/arm/arm64/CONFIG_SPMI_MSM_PMIC_ARB @@ -1 +1 @@ -CONFIG_SPMI_MSM_PMIC_ARB=m +CONFIG_SPMI_MSM_PMIC_ARB=y |