diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2019-08-21 13:35:16 +0200 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2019-08-21 13:35:16 +0200 |
commit | 880e4f93f94677dff02f795352ed4f069ee046b7 (patch) | |
tree | 339be7ef0256eb6586180f014a8bd8f2f3e7fa72 /drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | |
parent | 19d17d935b29f30510874fd34e93357eea0daba2 (diff) | |
parent | d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1 (diff) | |
download | linux-880e4f93f94677dff02f795352ed4f069ee046b7.tar.bz2 |
Merge tag 'v5.3-rc5' into devel
Linux 5.3-rc5
Diffstat (limited to 'drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c')
-rw-r--r-- | drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c index 05143097a1b1..95ea593fa29d 100644 --- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c @@ -2541,7 +2541,7 @@ static const struct aspeed_pin_config aspeed_g4_configs[] = { { PIN_CONFIG_INPUT_DEBOUNCE, { C14, B14 }, SCUA8, 27 }, }; -static int aspeed_g4_sig_expr_set(const struct aspeed_pinmux_data *ctx, +static int aspeed_g4_sig_expr_set(struct aspeed_pinmux_data *ctx, const struct aspeed_sig_expr *expr, bool enable) { |