patch-2.1.14 linux/init/main.c

• Lines: 47
• Date: Sun Dec 1 11:06:02 1996
• Orig file: v2.1.13/linux/init/main.c
• Orig date: Sat Nov 30 12:03:12 1996

diff -u --recursive --new-file v2.1.13/linux/init/main.c linux/init/main.c
@@ -9,10 +9,6 @@
  */
 
 #define __KERNEL_SYSCALLS__
-#include <stdarg.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
 
 #include <linux/types.h>
 #include <linux/fcntl.h>
@@ -37,8 +33,13 @@
 #include <linux/nfs_fs.h>
 #endif
 
+#include <asm/system.h>
+#include <asm/io.h>
 #include <asm/bugs.h>
 
+#include <stdarg.h>
+
+
 /*
  * Versions of gcc older than that listed below may actually compile
  * and link okay, but the end product can have subtle run time bugs.
@@ -91,6 +92,8 @@
 extern void aic7xxx_setup(char *str, int *ints);
 extern void AM53C974_setup(char *str, int *ints);
 extern void BusLogic_Setup(char *str, int *ints);
+extern void eata2x_setup(char *str, int *ints);
+extern void u14_34f_setup(char *str, int *ints);
 extern void fdomain_setup(char *str, int *ints);
 extern void in2000_setup(char *str, int *ints);
 extern void NCR53c406a_setup(char *str, int *ints);
@@ -320,6 +323,12 @@
 #endif
 #ifdef CONFIG_SCSI_BUSLOGIC
 	{ "BusLogic=", BusLogic_Setup},
+#endif
+#ifdef CONFIG_SCSI_EATA
+	{ "eata=", eata2x_setup},
+#endif
+#ifdef CONFIG_SCSI_U14_34F
+	{ "u14-34f=", u14_34f_setup},
 #endif
 #ifdef CONFIG_SCSI_AM53C974
         { "AM53C974=", AM53C974_setup},