diff options
author | 2024-12-20 10:25:44 +0100 | |
---|---|---|
committer | 2024-12-20 10:25:44 +0100 | |
commit | 60675d4ca1ef0857e44eba5849b74a3a998d0c0f (patch) | |
tree | b2fa39712aeca80db32be43f3f5be8e5a58bc0a3 /drivers/usb/cdns3/cdns3-imx.c | |
parent | x86/mtrr: Rename mtrr_overwrite_state() to guest_force_mtrr_state() (diff) | |
parent | Merge tag 'net-6.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
download | wireguard-linux-60675d4ca1ef0857e44eba5849b74a3a998d0c0f.tar.xz wireguard-linux-60675d4ca1ef0857e44eba5849b74a3a998d0c0f.zip |
Merge branch 'linus' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
-rw-r--r-- | drivers/usb/cdns3/cdns3-imx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/cdns3/cdns3-imx.c b/drivers/usb/cdns3/cdns3-imx.c index 281de47e2a3b..a2f041e1707c 100644 --- a/drivers/usb/cdns3/cdns3-imx.c +++ b/drivers/usb/cdns3/cdns3-imx.c @@ -422,7 +422,7 @@ MODULE_DEVICE_TABLE(of, cdns_imx_of_match); static struct platform_driver cdns_imx_driver = { .probe = cdns_imx_probe, - .remove_new = cdns_imx_remove, + .remove = cdns_imx_remove, .driver = { .name = "cdns3-imx", .of_match_table = cdns_imx_of_match, |