diff options
author | Tom Rini <trini@konsulko.com> | 2019-07-29 11:51:17 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-07-29 11:51:17 -0400 |
commit | 2d64a0f7e952f54375702fb2b854461e402ded9d (patch) | |
tree | 591a1592b29de743bb52895ebb098ebc8b00f57a /drivers/pinctrl/mediatek/pinctrl-mtk-common.c | |
parent | 92430b8fc8aac3b4ab92e9ca8a09d83c4788c609 (diff) | |
parent | f043dc28e3cce115089fb9ab86bc6f4bc4a8a882 (diff) |
Merge branch '2019-07-29-master-imports'
- Assorted bug fixes
Diffstat (limited to 'drivers/pinctrl/mediatek/pinctrl-mtk-common.c')
-rw-r--r-- | drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c index 938cc75496..3004335c57 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c @@ -14,6 +14,7 @@ #include "pinctrl-mtk-common.h" +#if CONFIG_IS_ENABLED(PINCONF) /** * struct mtk_drive_desc - the structure that holds the information * of the driving current @@ -39,6 +40,7 @@ static const struct mtk_drive_desc mtk_drive[] = { [DRV_GRP3] = { 2, 8, 2, 2 }, [DRV_GRP4] = { 2, 16, 2, 1 }, }; +#endif static const char *mtk_pinctrl_dummy_name = "_dummy"; |