Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next

[karo-tx-linux.git] / drivers / pcmcia / ds.c

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 84e665961bbdfc417c5ce1c106adde413dfcc181..2deacbb2ffdc4d325b9dea851d8d2dc56a44191a 100644 (file)
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -1318,7 +1318,7 @@ static struct pcmcia_callback pcmcia_bus_callback = {
        .resume = pcmcia_bus_resume,
 };
 
-static int __devinit pcmcia_bus_add_socket(struct device *dev,
+static int pcmcia_bus_add_socket(struct device *dev,
                                           struct class_interface *class_intf)
 {
        struct pcmcia_socket *socket = dev_get_drvdata(dev);