diff options
author | Domen Puncer <domen.puncer@ultra.si> | 2006-06-23 07:06:56 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-06-30 16:09:13 -0400 |
commit | 0973ddddca72bc8aee8a273c232060b9608d1793 (patch) | |
tree | 3c8af748681e22ea453344e4229f4bd06ad16fec | |
parent | a2bcce8ede4fbda0c2a5f2132115715dff056b9c (diff) |
[PATCH] au1xxx: pcmcia: fix __init called from non-init
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>
-rw-r--r-- | drivers/pcmcia/au1000_db1x00.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/au1000_db1x00.c b/drivers/pcmcia/au1000_db1x00.c index abc13f28ba3f..fef99f4e30c3 100644 --- a/drivers/pcmcia/au1000_db1x00.c +++ b/drivers/pcmcia/au1000_db1x00.c | |||
@@ -296,7 +296,7 @@ struct pcmcia_low_level db1x00_pcmcia_ops = { | |||
296 | .socket_suspend = db1x00_socket_suspend | 296 | .socket_suspend = db1x00_socket_suspend |
297 | }; | 297 | }; |
298 | 298 | ||
299 | int __init au1x_board_init(struct device *dev) | 299 | int au1x_board_init(struct device *dev) |
300 | { | 300 | { |
301 | int ret = -ENODEV; | 301 | int ret = -ENODEV; |
302 | bcsr->pcmcia = 0; /* turn off power, if it's not already off */ | 302 | bcsr->pcmcia = 0; /* turn off power, if it's not already off */ |