From: Jiri Slaby <jirislaby@gmail.com>
Date: Wed, 25 Apr 2007 23:35:22 +0000 (+0200)
Subject: Char: icom, mark __init as __devinit
X-Git-Tag: v2.6.16.50-rc1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ea2b4b19d3bc0d4075a4f176a9da5797be73304;p=thirdparty%2Fkernel%2Fstable.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 <jirislaby@gmail.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---

diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
index 144a7a352b28c..760a3bcc536b9 100644
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
@@ -166,7 +166,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;
@@ -1383,7 +1383,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;