projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a2bcce8
)
[PATCH] au1xxx: pcmcia: fix __init called from non-init
author
Domen Puncer
<domen.puncer@ultra.si>
Fri, 23 Jun 2006 11:06:56 +0000
(12:06 +0100)
committer
Dominik 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
patch
|
blob
|
history
diff --git
a/drivers/pcmcia/au1000_db1x00.c
b/drivers/pcmcia/au1000_db1x00.c
index
abc13f2
..
fef99f4
100644
(file)
--- a/
drivers/pcmcia/au1000_db1x00.c
+++ b/
drivers/pcmcia/au1000_db1x00.c
@@
-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 */