diff options
| author | Olof Johansson <olof@lixom.net> | 2018-06-26 13:42:31 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-06-26 13:42:31 -0400 |
| commit | fd28b4b5fb811cb39b6dc77e3e63169dbf4819b9 (patch) | |
| tree | 2abb9dc64906d2fa19111de7de65bf6715d97d57 | |
| parent | 975ba94c2c3aca4d9f1ae26f3916d7787495ce86 (diff) | |
| parent | 0ea3fa15b12739c5455cd5850ada4e9948171213 (diff) | |
Merge tag 'qcom-fixes-for-4.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into fixes
Qualcomm Fixes for v4.18-rc2
* Fix compiler warnings for cmd-db driver
* tag 'qcom-fixes-for-4.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
qcom: cmd-db: enforce CONFIG_OF_RESERVED_MEM dependency
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | drivers/soc/qcom/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index 9dc02f390ba3..5856e792d09c 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig | |||
| @@ -5,7 +5,8 @@ menu "Qualcomm SoC drivers" | |||
| 5 | 5 | ||
| 6 | config QCOM_COMMAND_DB | 6 | config QCOM_COMMAND_DB |
| 7 | bool "Qualcomm Command DB" | 7 | bool "Qualcomm Command DB" |
| 8 | depends on (ARCH_QCOM && OF) || COMPILE_TEST | 8 | depends on ARCH_QCOM || COMPILE_TEST |
| 9 | depends on OF_RESERVED_MEM | ||
| 9 | help | 10 | help |
| 10 | Command DB queries shared memory by key string for shared system | 11 | Command DB queries shared memory by key string for shared system |
| 11 | resources. Platform drivers that require to set state of a shared | 12 | resources. Platform drivers that require to set state of a shared |