summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/yenta_socket.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 19:23:12 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-28 21:10:16 +0100
commit34cdf25a126f053698d549cc12a9c30e9a8a0bab (patch)
tree9efbc1df6dc293b7334c9dfac664505be0676cdc /drivers/pcmcia/yenta_socket.c
parentpcmcia: remove use of __devexit_p (diff)
downloadlinux-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 '')
-rw-r--r--drivers/pcmcia/yenta_socket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 407f403800ea..caa92cc7a428 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -1142,7 +1142,7 @@ static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge)
* interrupt, and that we can map the cardbus area. Fill in the
* socket information structure..
*/
-static int __devinit yenta_probe(struct pci_dev *dev, const struct pci_device_id *id)
+static int yenta_probe(struct pci_dev *dev, const struct pci_device_id *id)
{
struct yenta_socket *socket;
int ret;