summaryrefslogtreecommitdiff
path: root/drivers/pcmcia/pd6729.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 22:23:12 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-29 00:10:16 +0400
commit34cdf25a126f053698d549cc12a9c30e9a8a0bab (patch)
tree9efbc1df6dc293b7334c9dfac664505be0676cdc /drivers/pcmcia/pd6729.c
parent96364e3a5cf1416c158a276134d9a4fc861548c2 (diff)
downloadlinux-34cdf25a126f053698d549cc12a9c30e9a8a0bab.tar.xz
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/pd6729.c')
-rw-r--r--drivers/pcmcia/pd6729.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
index aa79c0cc6dcf..4bb8426afe6d 100644
--- a/drivers/pcmcia/pd6729.c
+++ b/drivers/pcmcia/pd6729.c
@@ -589,7 +589,7 @@ static int pd6729_check_irq(int irq)
return 0;
}
-static u_int __devinit pd6729_isa_scan(void)
+static u_int pd6729_isa_scan(void)
{
u_int mask0, mask = 0;
int i;
@@ -620,7 +620,7 @@ static u_int __devinit pd6729_isa_scan(void)
return mask;
}
-static int __devinit pd6729_pci_probe(struct pci_dev *dev,
+static int pd6729_pci_probe(struct pci_dev *dev,
const struct pci_device_id *id)
{
int i, j, ret;