diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-06-03 09:23:20 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-06-03 09:23:20 +0000 |
| commit | ac5ff8f4a72f7b4e66f73c3c6cb9fe7758cf6f12 (patch) | |
| tree | 9fc7f8ce32e0d9a4aa055b2a58a05a5d727b333c /init | |
| parent | 52662ff3e66770fd7e4fc508c91056d29c08bff0 (diff) | |
Sync with Linux 2.1.42.
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/init/main.c b/init/main.c index ba1f17e7c..2bb0bb94c 100644 --- a/init/main.c +++ b/init/main.c @@ -172,9 +172,6 @@ static void no_initrd(char *s,int *ints); #ifdef CONFIG_ISDN_DRV_ICN extern void icn_setup(char *str, int *ints); #endif -#ifdef CONFIG_ISDN_DRV_TELES -extern void teles_setup(char *str, int *ints); -#endif #ifdef CONFIG_ISDN_DRV_HISAX extern void HiSax_setup(char *str, int *ints); #endif @@ -470,9 +467,6 @@ struct { #ifdef CONFIG_ISDN_DRV_ICN { "icn=", icn_setup }, #endif -#ifdef CONFIG_ISDN_DRV_TELES - { "teles=", teles_setup }, -#endif #ifdef CONFIG_ISDN_DRV_HISAX { "hisax=", HiSax_setup }, { "HiSax=", HiSax_setup }, @@ -992,7 +986,7 @@ printk("init() #2\n");while(1); else mount_initrd =0; #endif printk("init() #3\n");while(1); - setup(); + setup(0); printk("init() #4\n");while(1); #ifdef __SMP__ @@ -1037,6 +1031,8 @@ printk("init() #4\n");while(1); } #endif + setup(1); + if (open("/dev/console",O_RDWR,0) < 0) printk("Unable to open an initial console.\n"); |