diff options
| author |   Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2019-08-23 11:35:39 +0200 |
|---|---|---|
| committer | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2019-08-23 11:35:39 +0200 |
| commit | 6f50fa2a6f1395ad5f59ce7b87730f1f3ea19d76 (patch) | |
| tree | f826145c5bf9c502c033e7b67bcefc30eb0f9eee /drivers/pinctrl/qcom/pinctrl-msm.h | |
| parent | HID: logitech-dj: extend consumer usages range (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid (diff) | |
| download | wireguard-linux-6f50fa2a6f1395ad5f59ce7b87730f1f3ea19d76.tar.xz wireguard-linux-6f50fa2a6f1395ad5f59ce7b87730f1f3ea19d76.zip | |
Merge branch 'master' into for-5.4/logitech
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Diffstat (limited to 'drivers/pinctrl/qcom/pinctrl-msm.h')
| -rw-r--r-- | drivers/pinctrl/qcom/pinctrl-msm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pinctrl/qcom/pinctrl-msm.h b/drivers/pinctrl/qcom/pinctrl-msm.h index b724581c605c..48569cda8471 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.h +++ b/drivers/pinctrl/qcom/pinctrl-msm.h @@ -113,6 +113,7 @@ struct msm_pinctrl_soc_data { bool pull_no_keeper; const char *const *tiles; unsigned int ntiles; + const int *reserved_gpios; }; extern const struct dev_pm_ops msm_pinctrl_dev_pm_ops; |