diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 19:23:12 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 21:10:16 +0100 |
| commit | 34cdf25a126f053698d549cc12a9c30e9a8a0bab (patch) | |
| tree | 9efbc1df6dc293b7334c9dfac664505be0676cdc /drivers/pcmcia/bcm63xx_pcmcia.c | |
| parent | pcmcia: remove use of __devexit_p (diff) | |
| download | linux-34cdf25a126f053698d549cc12a9c30e9a8a0bab.tar.xz linux-34cdf25a126f053698d549cc12a9c30e9a8a0bab.zip | |
pcmcia: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pcmcia/bcm63xx_pcmcia.c')
| -rw-r--r-- | drivers/pcmcia/bcm63xx_pcmcia.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/bcm63xx_pcmcia.c b/drivers/pcmcia/bcm63xx_pcmcia.c index 57d1053d5bfa..7d2167995821 100644 --- a/drivers/pcmcia/bcm63xx_pcmcia.c +++ b/drivers/pcmcia/bcm63xx_pcmcia.c @@ -323,7 +323,7 @@ static struct pccard_operations bcm63xx_pcmcia_operations = { /* * register pcmcia socket to core */ -static int __devinit bcm63xx_drv_pcmcia_probe(struct platform_device *pdev) +static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev) { struct bcm63xx_pcmcia_socket *skt; struct pcmcia_socket *sock; @@ -461,7 +461,7 @@ struct platform_driver bcm63xx_pcmcia_driver = { }; #ifdef CONFIG_CARDBUS -static int __devinit bcm63xx_cb_probe(struct pci_dev *dev, +static int bcm63xx_cb_probe(struct pci_dev *dev, const struct pci_device_id *id) { /* keep pci device */ |