patch-2.2.17 linux/init/main.c
Next file: linux/kernel/ksyms.c
Previous file: linux/include/scsi/sg.h
Back to the patch index
Back to the overall index
- Lines: 59
- Date:
Mon Sep 4 18:39:28 2000
- Orig file:
v2.2.16/init/main.c
- Orig date:
Mon Sep 4 18:37:10 2000
diff -u --recursive --new-file v2.2.16/init/main.c linux/init/main.c
@@ -47,7 +47,7 @@
#endif
#ifdef CONFIG_DASD
-#include <linux/dasd.h>
+#include <asm/dasd.h>
#endif
#ifdef CONFIG_BLK_DEV_XPRAM
@@ -58,6 +58,8 @@
extern void nubus_init(void);
#endif
+extern int irda_device_init(void);
+
/*
* Versions of gcc older than that listed below may actually compile
* and link okay, but the end product can have subtle run time bugs.
@@ -199,9 +201,6 @@
#endif
#ifdef CONFIG_DASD
extern void dasd_setup(char *str, int *ints);
-#ifdef CONFIG_DASD_MDSK
-extern void dasd_mdsk_setup(char *str, int *ints);
-#endif
#endif
#ifdef CONFIG_BLK_DEV_XPRAM
extern void xpram_setup(char *str, int *ints);
@@ -1098,9 +1097,6 @@
#endif
#ifdef CONFIG_DASD
{ "dasd=", dasd_setup },
-#ifdef CONFIG_DASD_MDSK
- { "dasd_force_diag=", dasd_mdsk_setup },
-#endif
#endif
#ifdef CONFIG_BLK_DEV_XPRAM
{ "xpram_parts=", xpram_setup },
@@ -1414,6 +1410,9 @@
vma_init();
buffer_init(memory_end-memory_start);
page_cache_init(memory_end-memory_start);
+#ifdef CONFIG_ARCH_S390
+ ccwcache_init();
+#endif
signals_init();
inode_init();
file_table_init();
@@ -1552,9 +1551,7 @@
/* Set up devices .. */
device_setup();
-#if CONFIG_CHANDEV
- chandev_init();
-#endif
+
/* .. executable formats .. */
binfmt_setup();
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)