]> err.no Git - linux-2.6/commitdiff
[PATCH] au1xxx: pcmcia: fix __init called from non-init
authorDomen Puncer <domen.puncer@ultra.si>
Fri, 23 Jun 2006 11:06:56 +0000 (12:06 +0100)
committerDominik Brodowski <linux@dominikbrodowski.net>
Fri, 30 Jun 2006 20:09:13 +0000 (22:09 +0200)
This must not be marked __init, as it is called from
au1x00_drv_pcmcia_probe.

Signed-off-by: Domen Puncer <domen.puncer@ultra.si>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
drivers/pcmcia/au1000_db1x00.c

index abc13f28ba3f409396fe4b76d6caae9512b96cb3..fef99f4e30c3746aa8fe8bd2b7c62f0f24df8d11 100644 (file)
@@ -296,7 +296,7 @@ struct pcmcia_low_level db1x00_pcmcia_ops = {
        .socket_suspend         = db1x00_socket_suspend
 };
 
-int __init au1x_board_init(struct device *dev)
+int au1x_board_init(struct device *dev)
 {
        int ret = -ENODEV;
        bcsr->pcmcia = 0; /* turn off power, if it's not already off */