Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4364c9b0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: qcs405: Enable the common clock framework" into msm-4.14

parents f923a651 c0f18b39
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ CONFIG_SPI_SPIDEV=y
CONFIG_PINCTRL_QCS405=y
CONFIG_GPIOLIB=y
CONFIG_THERMAL=y
CONFIG_MFD_SYSCON=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_FAN53555=y
@@ -307,6 +308,7 @@ CONFIG_UIO=y
CONFIG_STAGING=y
CONFIG_ASHMEM=y
CONFIG_ION=y
CONFIG_COMMON_CLK_QCOM=y
CONFIG_HWSPINLOCK=y
CONFIG_MAILBOX=y
CONFIG_QCOM_SMEM=y
+2 −0
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ CONFIG_SPI_SPIDEV=y
CONFIG_PINCTRL_QCS405=y
CONFIG_GPIOLIB=y
CONFIG_THERMAL=y
CONFIG_MFD_SYSCON=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_FAN53555=y
@@ -317,6 +318,7 @@ CONFIG_UIO=y
CONFIG_STAGING=y
CONFIG_ASHMEM=y
CONFIG_ION=y
CONFIG_COMMON_CLK_QCOM=y
CONFIG_HWSPINLOCK=y
CONFIG_MAILBOX=y
CONFIG_QCOM_LAZY_MAPPING=y
+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ CONFIG_SLIMBUS=y
CONFIG_SLIMBUS_MSM_NGD=y
CONFIG_PINCTRL_QCS405=y
CONFIG_THERMAL=y
CONFIG_MFD_SYSCON=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_FAN53555=y
+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ CONFIG_SLIMBUS=y
CONFIG_SLIMBUS_MSM_NGD=y
CONFIG_PINCTRL_QCS405=y
CONFIG_THERMAL=y
CONFIG_MFD_SYSCON=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_FAN53555=y