Commit a1007770 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds

[PATCH] move 68360serial.c over use initcalls

this is the last serial driver not using initcalls.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: <jeff@uclinux.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 573fc113
......@@ -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) {
......
......@@ -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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment