patch-1.3.7 linux/init/main.c

• Lines: 97
• Date: Sat Jul 1 19:06:00 1995
• Orig file: v1.3.6/linux/init/main.c
• Orig date: Tue Jun 27 14:11:47 1995

diff -u --recursive --new-file v1.3.6/linux/init/main.c linux/init/main.c
@@ -54,8 +54,6 @@
 extern void eth_setup(char *str, int *ints);
 extern void xd_setup(char *str, int *ints);
 extern void floppy_setup(char *str, int *ints);
-extern void mcd_setup(char *str, int *ints);
-extern void aztcd_setup(char *str, int *ints);
 extern void st_setup(char *str, int *ints);
 extern void st0x_setup(char *str, int *ints);
 extern void tmc8xx_setup(char *str, int *ints);
@@ -68,15 +66,36 @@
 extern void buslogic_setup(char *str, int *ints);
 extern void scsi_luns_setup(char *str, int *ints);
 extern void sound_setup(char *str, int *ints);
-#ifdef CONFIG_SBPCD
-extern void sbpcd_setup(char *str, int *ints);
-#endif CONFIG_SBPCD
 #ifdef CONFIG_CDU31A
 extern void cdu31a_setup(char *str, int *ints);
 #endif CONFIG_CDU31A
+#ifdef CONFIG_MCD
+extern void mcd_setup(char *str, int *ints);
+#endif CONFIG_MCD
+#ifdef CONFIG_MCDX
+extern void mcdx_setup(char *str, int *ints);
+#endif CONFIG_MCDX
+#ifdef CONFIG_SBPCD
+extern void sbpcd_setup(char *str, int *ints);
+#endif CONFIG_SBPCD
+#ifdef CONFIG_AZTCD
+extern void aztcd_setup(char *str, int *ints);
+#endif CONFIG_AZTCD
 #ifdef CONFIG_CDU535
 extern void sonycd535_setup(char *str, int *ints);
 #endif CONFIG_CDU535
+#ifdef CONFIG_GSCD
+extern void gscd_setup(char *str, int *ints);
+#endif CONFIG_GSCD
+#ifdef CONFIG_CM206
+extern void cm206_setup(char *str, int *ints);
+#endif CONFIG_CM206
+#ifdef CONFIG_OPTCD
+extern void optcd_setup(char *str, int *ints);
+#endif CONFIG_OPTCD
+#ifdef CONFIG_SJCD
+extern void sjcd_setup(char *str, int *ints);
+#endif CONFIG_SJCD
 void ramdisk_setup(char *str, int *ints);
 
 #ifdef CONFIG_SYSVIPC
@@ -187,24 +206,39 @@
 #ifdef CONFIG_BLK_DEV_FD
 	{ "floppy=", floppy_setup },
 #endif
+#ifdef CONFIG_CDU31A
+	{ "cdu31a=", cdu31a_setup },
+#endif CONFIG_CDU31A
 #ifdef CONFIG_MCD
 	{ "mcd=", mcd_setup },
-#endif
+#endif CONFIG_MCD
+#ifdef CONFIG_MCDX
+	{ "mcdx=", mcdx_setup },
+#endif CONFIG_MCDX
+#ifdef CONFIG_SBPCD
+	{ "sbpcd=", sbpcd_setup },
+#endif CONFIG_SBPCD
 #ifdef CONFIG_AZTCD
 	{ "aztcd=", aztcd_setup },
-#endif
+#endif CONFIG_AZTCD
 #ifdef CONFIG_CDU535
 	{ "sonycd535=", sonycd535_setup },
 #endif CONFIG_CDU535
+#ifdef CONFIG_GSCD
+	{ "gscd=", gscd_setup },
+#endif CONFIG_GSCD
+#ifdef CONFIG_CM206
+	{ "cm206=", cm206_setup },
+#endif CONFIG_CM206
+#ifdef CONFIG_OPTCD
+	{ "optcd=", optcd_setup },
+#endif CONFIG_OPTCD
+#ifdef CONFIG_SJCD
+	{ "sjcd=", sjcd_setup },
+#endif CONFIG_SJCD
 #ifdef CONFIG_SOUND
 	{ "sound=", sound_setup },
 #endif
-#ifdef CONFIG_SBPCD
-	{ "sbpcd=", sbpcd_setup },
-#endif CONFIG_SBPCD
-#ifdef CONFIG_CDU31A
-	{ "cdu31a=", cdu31a_setup },
-#endif CONFIG_CDU31A
 	{ 0, 0 }
 };