diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-12-05 11:48:58 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-12-05 11:50:14 -0800 |
| commit | 302cc446cbd92aadff72a647cebc13d5634f8342 (patch) | |
| tree | 759fe019d2e1c82ca8590f34c7ba46ab9ddada6e /drivers/tty/serial/esp32_uart.c | |
| parent | da4fa00abe5674d3d165cfd8032c740e8aab4d3b (diff) | |
| parent | 896d8946da97332d4dc80fa1937d8dd6b1c35ad4 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.13-rc2).
No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/tty/serial/esp32_uart.c')
| -rw-r--r-- | drivers/tty/serial/esp32_uart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/esp32_uart.c b/drivers/tty/serial/esp32_uart.c index 8c86cf9cb763..667c2198a03a 100644 --- a/drivers/tty/serial/esp32_uart.c +++ b/drivers/tty/serial/esp32_uart.c @@ -743,7 +743,7 @@ static void esp32_uart_remove(struct platform_device *pdev) static struct platform_driver esp32_uart_driver = { .probe = esp32_uart_probe, - .remove_new = esp32_uart_remove, + .remove = esp32_uart_remove, .driver = { .name = DRIVER_NAME, .of_match_table = esp32_uart_dt_ids, |