diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:23:12 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 12:10:16 -0800 |
commit | 34cdf25a126f053698d549cc12a9c30e9a8a0bab (patch) | |
tree | 9efbc1df6dc293b7334c9dfac664505be0676cdc /drivers/pcmcia/ds.c | |
parent | 96364e3a5cf1416c158a276134d9a4fc861548c2 (diff) | |
download | linux-34cdf25a126f053698d549cc12a9c30e9a8a0bab.tar.gz linux-34cdf25a126f053698d549cc12a9c30e9a8a0bab.tar.bz2 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/ds.c')
-rw-r--r-- | drivers/pcmcia/ds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 84e665961bbd..2deacbb2ffdc 100644 --- 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); |