aboutsummaryrefslogtreecommitdiff
path: root/include/asm-arm/bug.h
diff options
context:
space:
mode:
authorGravatar David Woodhouse <dwmw2@infradead.org> 2006-05-06 19:59:18 +0100
committerGravatar David Woodhouse <dwmw2@infradead.org> 2006-05-06 19:59:18 +0100
commit5047f09b56d0bc3c21aec9cb16de60283da645c6 (patch)
tree09a07554b933c3bb912ce3bfc0ea7c7e1f16041c /include/asm-arm/bug.h
parentRevert include/media changes: Mauro says those ioctls are only used in-kernel(!) (diff)
parent[TCP]: Fix snd_cwnd adjustments in tcp_highspeed.c (diff)
downloadlinux-5047f09b56d0bc3c21aec9cb16de60283da645c6.tar.gz
linux-5047f09b56d0bc3c21aec9cb16de60283da645c6.tar.bz2
linux-5047f09b56d0bc3c21aec9cb16de60283da645c6.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-arm/bug.h')
-rw-r--r--include/asm-arm/bug.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/bug.h b/include/asm-arm/bug.h
index 0e36fd5d87df..7fb02138f585 100644
--- a/include/asm-arm/bug.h
+++ b/include/asm-arm/bug.h
@@ -1,6 +1,7 @@
#ifndef _ASMARM_BUG_H
#define _ASMARM_BUG_H
+#include <linux/config.h>
#ifdef CONFIG_BUG
#ifdef CONFIG_DEBUG_BUGVERBOSE