Merge tag 'kbuild-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[platform/kernel/linux-rpi.git] / drivers / pcmcia / bcm63xx_pcmcia.c

diff --git a/drivers/pcmcia/bcm63xx_pcmcia.c b/drivers/pcmcia/bcm63xx_pcmcia.c
index bb06311..dd3c260 100644 (file)
--- a/drivers/pcmcia/bcm63xx_pcmcia.c
+++ b/drivers/pcmcia/bcm63xx_pcmcia.c
@@ -443,7 +443,7 @@ static int bcm63xx_drv_pcmcia_remove(struct platform_device *pdev)
        struct resource *res;
 
        skt = platform_get_drvdata(pdev);
-       del_timer_sync(&skt->timer);
+       timer_shutdown_sync(&skt->timer);
        iounmap(skt->base);
        iounmap(skt->io_base);
        res = skt->reg_res;