aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2007-04-23 14:41:20 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-24 08:23:09 -0700
commit98f85d30ced96ac466f30419de8b3fac341ebe75 (patch)
tree7c43fb99c3586b03c4385e5aadd5ca5248274e2a
parentreiserfs: fix xattr root locking/refcount bug (diff)
downloadlinux-dev-98f85d30ced96ac466f30419de8b3fac341ebe75.tar.xz
linux-dev-98f85d30ced96ac466f30419de8b3fac341ebe75.zip
Char: icom, mark __init as __devinit
Two functions are called from __devinit context, but they are marked as __init. Fix this. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/serial/icom.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
index d7aaf7648490..246c5572667b 100644
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
@@ -164,7 +164,7 @@ static void free_port_memory(struct icom_port *icom_port)
}
}
-static int __init get_port_memory(struct icom_port *icom_port)
+static int __devinit get_port_memory(struct icom_port *icom_port)
{
int index;
unsigned long stgAddr;
@@ -1380,7 +1380,7 @@ static void icom_port_active(struct icom_port *icom_port, struct icom_adapter *i
0x8024 + 2 - 2 * (icom_port->port - 2);
}
}
-static int __init icom_load_ports(struct icom_adapter *icom_adapter)
+static int __devinit icom_load_ports(struct icom_adapter *icom_adapter)
{
struct icom_port *icom_port;
int port_num;