diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/kref.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/kref.h')
| -rw-r--r-- | include/linux/kref.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/kref.h b/include/linux/kref.h index 5d185635786e..0cef6badd6fb 100644 --- a/include/linux/kref.h +++ b/include/linux/kref.h | |||
| @@ -15,8 +15,6 @@ | |||
| 15 | #ifndef _KREF_H_ | 15 | #ifndef _KREF_H_ |
| 16 | #define _KREF_H_ | 16 | #define _KREF_H_ |
| 17 | 17 | ||
| 18 | #ifdef __KERNEL__ | ||
| 19 | |||
| 20 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 21 | #include <asm/atomic.h> | 19 | #include <asm/atomic.h> |
| 22 | 20 | ||
| @@ -29,5 +27,4 @@ void kref_init(struct kref *kref); | |||
| 29 | void kref_get(struct kref *kref); | 27 | void kref_get(struct kref *kref); |
| 30 | int kref_put(struct kref *kref, void (*release) (struct kref *kref)); | 28 | int kref_put(struct kref *kref, void (*release) (struct kref *kref)); |
| 31 | 29 | ||
| 32 | #endif /* __KERNEL__ */ | ||
| 33 | #endif /* _KREF_H_ */ | 30 | #endif /* _KREF_H_ */ |