patch-2.4.22 linux-2.4.22/include/asm-mips/inventory.h

Next file: linux-2.4.22/include/asm-mips/io.h
Previous file: linux-2.4.22/include/asm-mips/ide.h
Back to the patch index
Back to the overall index

diff -urN linux-2.4.21/include/asm-mips/inventory.h linux-2.4.22/include/asm-mips/inventory.h
@@ -4,9 +4,6 @@
 #ifndef __ASM_INVENTORY_H
 #define __ASM_INVENTORY_H
 
-#include <linux/config.h>
-
-#ifdef CONFIG_BINFMT_IRIX
 typedef struct inventory_s {
 	struct inventory_s *inv_next;
 	int    inv_class;
@@ -19,10 +16,5 @@
 extern int inventory_items;
 void add_to_inventory (int class, int type, int controller, int unit, int state);
 int dump_inventory_to_user (void *userbuf, int size);
-void init_inventory (void);
 
-#else
-#define add_to_inventory(c,t,o,u,s)
-#define init_inventory()
-#endif
 #endif /* __ASM_INVENTORY_H */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)