From 34cdf25a126f053698d549cc12a9c30e9a8a0bab Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:23:12 -0500 Subject: pcmcia: remove use of __devinit CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton Cc: Eric Miao Cc: Russell King Cc: Haojian Zhuang Acked-by: Eric Miao Signed-off-by: Greg Kroah-Hartman --- drivers/pcmcia/bcm63xx_pcmcia.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/pcmcia/bcm63xx_pcmcia.c') 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 */ -- cgit v1.2.3