summaryrefslogtreecommitdiff
path: root/include/linux/kernel.h
diff options
context:
space:
mode:
authorJames Simmons <jsimmons@maxwell.earthlink.net>2003-01-13 23:27:55 -0800
committerJames Simmons <jsimmons@maxwell.earthlink.net>2003-01-13 23:27:55 -0800
commit95cf11e7bc3dcf77fdeea27f99c80fd6f94a64f3 (patch)
treeaeedd327ca5caa63fbf426144a11736d794408b6 /include/linux/kernel.h
parentcfe1d063052b6304316afbbd5af11f7ed392fad0 (diff)
parent9552d6bcc66126252565555d137ff5e5e45cb959 (diff)
Merge maxwell.earthlink.net:/usr/src/linus-2.5
into maxwell.earthlink.net:/usr/src/fbdev-2.5
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r--include/linux/kernel.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 7eedbb751856..5cd1d8dc77f7 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -13,6 +13,7 @@
#include <linux/types.h>
#include <linux/compiler.h>
#include <asm/byteorder.h>
+#include <asm/bug.h>
/* Optimization barrier */
/* The "volatile" is due to gcc bugs */