diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-31 05:37:12 +0300 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-31 05:37:12 +0300 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /include/asm-mips/inventory.h | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
| download | linux-23fd07750a789a66fe88cf173d52a18f1a387da4.tar.xz | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'include/asm-mips/inventory.h')
| -rw-r--r-- | include/asm-mips/inventory.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/asm-mips/inventory.h b/include/asm-mips/inventory.h index 4cd36fe98173..92d90f75a636 100644 --- a/include/asm-mips/inventory.h +++ b/include/asm-mips/inventory.h @@ -4,6 +4,8 @@ #ifndef __ASM_INVENTORY_H #define __ASM_INVENTORY_H +#include <linux/compiler.h> + typedef struct inventory_s { struct inventory_s *inv_next; int inv_class; @@ -14,7 +16,9 @@ typedef struct inventory_s { } inventory_t; 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); + +extern void add_to_inventory (int class, int type, int controller, int unit, int state); +extern int dump_inventory_to_user (void __user *userbuf, int size); +extern int __init init_inventory(void); #endif /* __ASM_INVENTORY_H */ |