diff options
author | 2025-01-20 21:37:39 -0800 | |
---|---|---|
committer | 2025-01-20 21:37:39 -0800 | |
commit | 25768de50b1f2dbb6ea44bd5148a87fe2c9c3688 (patch) | |
tree | 91f4e0c1ea9acb1e8d477a5f4dfedd00de67ae13 /drivers/gpio/gpio-mpc5200.c | |
parent | Input: xpad - add support for Nacon Evol-X Xbox One Controller (diff) | |
parent | Input: synaptics - fix crash when enabling pass-through port (diff) | |
download | wireguard-linux-25768de50b1f2dbb6ea44bd5148a87fe2c9c3688.tar.xz wireguard-linux-25768de50b1f2dbb6ea44bd5148a87fe2c9c3688.zip |
Merge branch 'next' into for-linus
Prepare input updates for 6.14 merge window.
Diffstat (limited to 'drivers/gpio/gpio-mpc5200.c')
-rw-r--r-- | drivers/gpio/gpio-mpc5200.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-mpc5200.c b/drivers/gpio/gpio-mpc5200.c index a199dce3394a..091d96f2d682 100644 --- a/drivers/gpio/gpio-mpc5200.c +++ b/drivers/gpio/gpio-mpc5200.c @@ -183,7 +183,7 @@ static struct platform_driver mpc52xx_wkup_gpiochip_driver = { .of_match_table = mpc52xx_wkup_gpiochip_match, }, .probe = mpc52xx_wkup_gpiochip_probe, - .remove_new = mpc52xx_gpiochip_remove, + .remove = mpc52xx_gpiochip_remove, }; /* @@ -336,7 +336,7 @@ static struct platform_driver mpc52xx_simple_gpiochip_driver = { .of_match_table = mpc52xx_simple_gpiochip_match, }, .probe = mpc52xx_simple_gpiochip_probe, - .remove_new = mpc52xx_gpiochip_remove, + .remove = mpc52xx_gpiochip_remove, }; static struct platform_driver * const drivers[] = { |