Merge tag 'qcom-drivers-for-4.21-2' of...

Merge tag 'qcom-drivers-for-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers

Qualcomm ARM Based Driver Updates for v4.21 Part 2 - Redo

* Fix SCM compilation error

* tag 'qcom-drivers-for-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux

:
  firmware: qcom: scm: fix compilation error when disabled

Signed-off-by: Arnd Bergmann <arnd@arndb.de>