patch-2.1.106 linux/init/main.c

• Lines: 89
• Date: Sat Jun 13 13:14:32 1998
• Orig file: v2.1.105/linux/init/main.c
• Orig date: Tue Jun 9 11:57:31 1998

diff -u --recursive --new-file v2.1.105/linux/init/main.c linux/init/main.c
@@ -44,6 +44,10 @@
 #include <linux/pci.h>
 #endif
 
+#ifdef CONFIG_DIO
+#include <linux/dio.h>
+#endif
+
 /*
  * Versions of gcc older than that listed below may actually compile
  * and link okay, but the end product can have subtle run time bugs.
@@ -76,6 +80,10 @@
 extern void filescache_init(void);
 extern void signals_init(void);
 
+#ifdef CONFIG_ARCH_ACORN
+extern void ecard_init(void);
+#endif
+
 extern void smp_setup(char *str, int *ints);
 #ifdef __i386__
 extern void ioapic_pirq_setup(char *str, int *ints);
@@ -124,6 +132,9 @@
 #ifdef CONFIG_PARIDE_PT
 extern void pt_setup(char *str, int *ints);
 #endif
+#ifdef CONFIG_PARIDE_PG
+extern void pg_setup(char *str, int *ints);
+#endif
 #ifdef CONFIG_PARIDE_PCD
 extern void pcd_setup(char *str, int *ints);
 #endif
@@ -378,6 +389,17 @@
 	{ "sdc",     0x0820 },
 	{ "sdd",     0x0830 },
 	{ "sde",     0x0840 },
+	{ "sdf",     0x0850 },
+	{ "sdg",     0x0860 },
+	{ "sdh",     0x0870 },
+	{ "sdi",     0x0880 },
+	{ "sdj",     0x0890 },
+	{ "sdk",     0x08a0 },
+	{ "sdl",     0x08b0 },
+	{ "sdm",     0x08c0 },
+	{ "sdn",     0x08d0 },
+	{ "sdo",     0x08e0 },
+	{ "sdp",     0x08f0 },
 #endif
 #ifdef CONFIG_ATARI_ACSI
 	{ "ada",     0x1c00 },
@@ -667,7 +689,7 @@
 #ifdef CONFIG_ISP16_CDI
 	{ "isp16=", isp16_setup },
 #endif CONFIG_ISP16_CDI
-#ifdef CONFIG_SOUND
+#ifdef CONFIG_SOUND_OSS
 	{ "sound=", sound_setup },
 #endif
 #ifdef CONFIG_ISDN_DRV_ICN
@@ -778,6 +800,9 @@
 #ifdef CONFIG_PARIDE_PT
         { "pt.", pt_setup },
 #endif
+#ifdef CONFIG_PARIDE_PG
+        { "pg.", pg_setup },
+#endif
 	{ 0, 0 }
 };
 
@@ -1090,6 +1115,9 @@
 #ifdef CONFIG_SYSCTL
 	sysctl_init();
 #endif
+#ifdef CONFIG_DIO
+	dio_init();
+#endif
 
 	/*
 	 * Ok, at this point all CPU's should be initialized, so
@@ -1106,6 +1134,9 @@
 #endif
 #ifdef CONFIG_MCA
 	mca_init();
+#endif
+#ifdef CONFIG_ARCH_ACORN
+	ecard_init();
 #endif
 
 	/*