diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-17 20:51:24 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-17 20:51:24 +0200 |
| commit | 5dd8816aeb1f068ade0349a22009ff7a66f25413 (patch) | |
| tree | c56ff327b1dfa8868b4208aea9ac4158e3bfe308 /include/asm-arm/bug.h | |
| parent | [PATCH] bcm43xx: add PCI ID for bcm4319 (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6 (diff) | |
| download | linux-5dd8816aeb1f068ade0349a22009ff7a66f25413.tar.xz linux-5dd8816aeb1f068ade0349a22009ff7a66f25413.zip | |
Merge branch 'from-linus' into upstream
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 @@ #define _ASMARM_BUG_H #include <linux/config.h> +#include <linux/stddef.h> #ifdef CONFIG_BUG #ifdef CONFIG_DEBUG_BUGVERBOSE |