diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
| commit | 230e5ab6a084ed50470f101934782dbf54b0d06b (patch) | |
| tree | 5dd821c8d33f450470588e7a543f74bf74306e9e /init | |
| parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) | |
Merge with Linux 2.1.67.
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index e0fedf343..8f2adb5ab 100644 --- a/init/main.c +++ b/init/main.c @@ -120,6 +120,7 @@ extern void generic_NCR5380_setup(char *str, int *intr); extern void generic_NCR53C400_setup(char *str, int *intr); extern void aha152x_setup(char *str, int *ints); extern void aha1542_setup(char *str, int *ints); +extern void gdth_setup(char *str, int *ints); extern void aic7xxx_setup(char *str, int *ints); extern void AM53C974_setup(char *str, int *ints); extern void BusLogic_Setup(char *str, int *ints); @@ -244,6 +245,9 @@ extern void plip_setup(char *str, int *ints); #ifdef CONFIG_HFMODEM extern void hfmodem_setup(char *str, int *ints); #endif +#ifdef CONFIG_FTAPE +extern void ftape_setup(char *str, int *ints); +#endif #if defined(CONFIG_SYSVIPC) || defined(CONFIG_KERNELD) extern void ipc_init(void); @@ -416,6 +420,9 @@ struct { #ifdef CONFIG_SCSI_AHA1542 { "aha1542=", aha1542_setup}, #endif +#ifdef CONFIG_SCSI_GDTH + { "gdth=", gdth_setup}, +#endif #ifdef CONFIG_SCSI_AIC7XXX { "aic7xxx=", aic7xxx_setup}, #endif @@ -567,6 +574,9 @@ struct { { "console=", pmac_cons_setup }, { "vmode=", pmac_vmode_setup }, #endif +#ifdef CONFIG_FTAPE + { "ftape=", ftape_setup}, +#endif { 0, 0 } }; |