[Linux-mips-commits]CVS: linux/init main.c,1.5,1.6

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/init
In directory usw-pr-cvs1:/tmp/cvs-serv5739/init

Modified Files:
	main.c 
Log Message:
Sync with OSS 2.4.9.



Index: main.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/init/main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- main.c	2001/08/25 02:19:28	1.5
+++ main.c	2001/09/25 03:36:36	1.6
@@ -87,7 +87,6 @@
 
 extern void init_IRQ(void);
 extern void init_modules(void);
-extern void init_inventory(void);
 extern void sock_init(void);
 extern void fork_init(unsigned long);
 extern void mca_init(void);
@@ -571,9 +570,6 @@
 		    "disabling it.\n",initrd_start,min_low_pfn << PAGE_SHIFT);
 		initrd_start = 0;
 	}
-#endif
-#ifdef CONFIG_BINFMT_IRIX
-	init_inventory();
 #endif
 	mem_init();
 	kmem_cache_sizes_init();