[target] generic: ESFQ patch, only include net/netfilter/nf_conntrack.h when CONFIG_N...

[openwrt.git] / target / linux / brcm63xx / files / drivers / pcmcia / bcm63xx_pcmcia.c

diff --git a/target/linux/brcm63xx/files/drivers/pcmcia/bcm63xx_pcmcia.c b/target/linux/brcm63xx/files/drivers/pcmcia/bcm63xx_pcmcia.c
index 0222b20..383e322 100644 (file)
--- a/target/linux/brcm63xx/files/drivers/pcmcia/bcm63xx_pcmcia.c
+++ b/target/linux/brcm63xx/files/drivers/pcmcia/bcm63xx_pcmcia.c
@@ -455,6 +455,7 @@ static int bcm63xx_drv_pcmcia_remove(struct platform_device *pdev)
        res = skt->reg_res;
        release_mem_region(res->start, res->end - res->start + 1);
        gpio_free(skt->pd->ready_gpio);
+       platform_set_drvdata(pdev, NULL);
        kfree(skt);
        return 0;
 }
@@ -466,8 +467,6 @@ struct platform_driver bcm63xx_pcmcia_driver = {
                .name   = "bcm63xx_pcmcia",
                .owner  = THIS_MODULE,
        },
-
-       { },
 };
 
 #ifdef CONFIG_CARDBUS