diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
commit | 168660f24dfc46c2702acbe4701a446f42a59578 (patch) | |
tree | f431368afbf6b1b71809cf3fd904d800ea126f4d /include/linux/ncp_fs.h | |
parent | 6420f767924fa73b0ea267864d96820815f4ba5a (diff) |
Merge with Linux 2.4.0-test5-pre3.
Diffstat (limited to 'include/linux/ncp_fs.h')
-rw-r--r-- | include/linux/ncp_fs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ncp_fs.h b/include/linux/ncp_fs.h index 87dfef8cb..cedd7f05e 100644 --- a/include/linux/ncp_fs.h +++ b/include/linux/ncp_fs.h @@ -212,13 +212,13 @@ static inline void * static inline void ncp_kfree_s(void *obj, int size) { ncp_current_malloced -= 1; - kfree_s(obj, size); + kfree(obj, size); } #else /* DEBUG_NCP_MALLOC */ #define ncp_kmalloc(s,p) kmalloc(s,p) -#define ncp_kfree_s(o,s) kfree_s(o,s) +#define ncp_kfree_s(o,s) kfree(o) #endif /* DEBUG_NCP_MALLOC */ |