Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / include / linux / kfifo.h

diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h
index 2dd610d6fdd38fe646aa0585444dff76ee7b6d69..17065f7681a036cd27494cef8f94be05137dc23e 100644 (file)
--- a/include/linux/kfifo.h
+++ b/include/linux/kfifo.h
@@ -21,8 +21,6 @@
 #ifndef _LINUX_KFIFO_H
 #define _LINUX_KFIFO_H
 
-#ifdef __KERNEL__
-
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
 
@@ -186,7 +184,4 @@ static inline unsigned int kfifo_get_to_user(struct kfifo *fifo,
        return ret;
 }
 
-#else
-#warning "don't include kernel headers in userspace"
-#endif /* __KERNEL__ */
 #endif