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/kfifo.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/kfifo.h')
| -rw-r--r-- | include/linux/kfifo.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h index 404f4464cb1a..29f62e1733ff 100644 --- a/include/linux/kfifo.h +++ b/include/linux/kfifo.h | |||
| @@ -21,8 +21,6 @@ | |||
| 21 | #ifndef _LINUX_KFIFO_H | 21 | #ifndef _LINUX_KFIFO_H |
| 22 | #define _LINUX_KFIFO_H | 22 | #define _LINUX_KFIFO_H |
| 23 | 23 | ||
| 24 | #ifdef __KERNEL__ | ||
| 25 | |||
| 26 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 27 | #include <linux/spinlock.h> | 25 | #include <linux/spinlock.h> |
| 28 | 26 | ||
| @@ -151,7 +149,4 @@ static inline unsigned int kfifo_len(struct kfifo *fifo) | |||
| 151 | return ret; | 149 | return ret; |
| 152 | } | 150 | } |
| 153 | 151 | ||
| 154 | #else | ||
| 155 | #warning "don't include kernel headers in userspace" | ||
| 156 | #endif /* __KERNEL__ */ | ||
| 157 | #endif | 152 | #endif |