summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@kernel.crashing.org>2004-11-07 04:10:44 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-11-07 04:10:44 -0800
commit5eab006d95919a025911d9c53a654fcc1e109ac6 (patch)
tree1b651e4aa74d371eb02ab5fa4b0d6bd468ffa120 /include
parent27ec38fdf20de7a9210cc07cfda91d47948aed44 (diff)
[PATCH] Add __KERNEL__ to <linux/crc-ccitt.h>
The following adds a __KERNEL__ check to <linux/crc-ccitt.h>. The problem is that the ppp package includes <linux/ppp_defs.h> via <net/ppp_defs.h>, which in turn gets <linux/crc-ccitt.h>. Signed-off-by: Tom Rini <trini@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/crc-ccitt.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/crc-ccitt.h b/include/linux/crc-ccitt.h
index f52696a1ff0d..90037617da8f 100644
--- a/include/linux/crc-ccitt.h
+++ b/include/linux/crc-ccitt.h
@@ -1,5 +1,6 @@
#ifndef _LINUX_CRC_CCITT_H
#define _LINUX_CRC_CCITT_H
+#ifdef __KERNEL__
#include <linux/types.h>
@@ -12,4 +13,5 @@ static inline u16 crc_ccitt_byte(u16 crc, const u8 c)
return (crc >> 8) ^ crc_ccitt_table[(crc ^ c) & 0xff];
}
+#endif /* __KERNEL__ */
#endif /* _LINUX_CRC_CCITT_H */