From 98390b0d720f88b3a786f9ad3145ac5d354cb862 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Tue, 6 Sep 2005 15:16:59 -0700
Subject: [PATCH] --- yaml --- r: 7353 b: refs/heads/master c:
 a10077708233becfbae7b0104e1e8c0569359aa7 h: refs/heads/master i:   7351:
 08d6206858f042abc280467f60ccd9c4dab9fbf7 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/char/tty_io.c        | 6 ------
 trunk/drivers/serial/68360serial.c | 8 ++------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index a8b5b6c1e4ab..9ed1daf49371 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 573fc113133e0b0984d2c0090e706c6506661f91
+refs/heads/master: a10077708233becfbae7b0104e1e8c0569359aa7
diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c
index 6e4be3bb2d89..9d657127f313 100644
--- a/trunk/drivers/char/tty_io.c
+++ b/trunk/drivers/char/tty_io.c
@@ -153,7 +153,6 @@ static int tty_release(struct inode *, struct file *);
 int tty_ioctl(struct inode * inode, struct file * file,
 	      unsigned int cmd, unsigned long arg);
 static int tty_fasync(int fd, struct file * filp, int on);
-extern void rs_360_init(void);
 static void release_mem(struct tty_struct *tty, int idx);
 
 
@@ -2910,11 +2909,6 @@ void __init console_init(void)
 	 */
 #ifdef CONFIG_EARLY_PRINTK
 	disable_early_printk();
-#endif
-#ifdef CONFIG_SERIAL_68360
- 	/* This is not a console initcall. I know not what it's doing here.
-	   So I haven't moved it. dwmw2 */
-        rs_360_init();
 #endif
 	call = __con_initcall_start;
 	while (call < __con_initcall_end) {
diff --git a/trunk/drivers/serial/68360serial.c b/trunk/drivers/serial/68360serial.c
index b116122e569a..170c9d2a749c 100644
--- a/trunk/drivers/serial/68360serial.c
+++ b/trunk/drivers/serial/68360serial.c
@@ -2474,8 +2474,7 @@ static struct tty_operations rs_360_ops = {
 	.tiocmset = rs_360_tiocmset,
 };
 
-/* int __init rs_360_init(void) */
-int rs_360_init(void)
+static int __init rs_360_init(void)
 {
 	struct serial_state * state;
 	ser_info_t	*info;
@@ -2827,10 +2826,7 @@ int rs_360_init(void)
 
 	return 0;
 }
-
-
-
-
+module_init(rs_360_init);
 
 /* This must always be called before the rs_360_init() function, otherwise
  * it blows away the port control information.