diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-15 20:19:52 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-15 20:19:52 -0400 |
| commit | 18594822fcb01d4b35e05b9018f770a0b4156d1a (patch) | |
| tree | 38d35c38086a564beaac215f8e52694cdbfab1c3 /include/asm-arm/bug.h | |
| parent | 5b5ffbc1e6d62d89747f3f59c09b2e488a7d7fce (diff) | |
| parent | c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 (diff) | |
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.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/bug.h b/include/asm-arm/bug.h index 7fb02138f585..5ab8216f5204 100644 --- a/include/asm-arm/bug.h +++ b/include/asm-arm/bug.h | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | #define _ASMARM_BUG_H | 2 | #define _ASMARM_BUG_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | 4 | #include <linux/config.h> |
| 5 | #include <linux/stddef.h> | ||
| 5 | 6 | ||
| 6 | #ifdef CONFIG_BUG | 7 | #ifdef CONFIG_BUG |
| 7 | #ifdef CONFIG_DEBUG_BUGVERBOSE | 8 | #ifdef CONFIG_DEBUG_BUGVERBOSE |