From: Jiri Slaby Date: Mon, 23 Apr 2007 21:41:20 +0000 (-0700) Subject: Char: icom, mark __init as __devinit X-Git-Tag: v2.6.21~13 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=98f85d30ced96ac466f30419de8b3fac341ebe75;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c index d7aaf764849..246c5572667 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;