aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/mem.c2
-rw-r--r--drivers/char/tty_io.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index f54dab8acdcd..a398ecdbd758 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -916,7 +916,7 @@ static int __init chr_dev_init(void)
916 NULL, devlist[minor].name); 916 NULL, devlist[minor].name);
917 } 917 }
918 918
919 return 0; 919 return tty_init();
920} 920}
921 921
922fs_initcall(chr_dev_init); 922fs_initcall(chr_dev_init);
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index d71f0fc34b46..507441ac6edb 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -3128,7 +3128,7 @@ static struct cdev tty_cdev, console_cdev;
3128 * Ok, now we can initialize the rest of the tty devices and can count 3128 * Ok, now we can initialize the rest of the tty devices and can count
3129 * on memory allocations, interrupts etc.. 3129 * on memory allocations, interrupts etc..
3130 */ 3130 */
3131static int __init tty_init(void) 3131int __init tty_init(void)
3132{ 3132{
3133 cdev_init(&tty_cdev, &tty_fops); 3133 cdev_init(&tty_cdev, &tty_fops);
3134 if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) || 3134 if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) ||
@@ -3149,4 +3149,4 @@ static int __init tty_init(void)
3149#endif 3149#endif
3150 return 0; 3150 return 0;
3151} 3151}
3152module_init(tty_init); 3152