diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
| commit | 0a3a98f6dd4e8f4d928a09302c0d1c56f2192ac3 (patch) | |
| tree | 92f55e374a84d06ce8213a4540454760fdecf137 /include/asm-frv/bug.h | |
| parent | 8ef12c9f01afba47c2d33bb939085111ca0d0f7d (diff) | |
| parent | 5367f2d67c7d0bf1faae90e6e7b4e2ac3c9b5e0f (diff) | |
Merge Linus' tree.
Diffstat (limited to 'include/asm-frv/bug.h')
| -rw-r--r-- | include/asm-frv/bug.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-frv/bug.h b/include/asm-frv/bug.h index 074c0d5770eb..451712cc3060 100644 --- a/include/asm-frv/bug.h +++ b/include/asm-frv/bug.h | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #define _ASM_BUG_H | 12 | #define _ASM_BUG_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | 14 | #include <linux/config.h> |
| 15 | #include <linux/linkage.h> | ||
| 15 | 16 | ||
| 16 | #ifdef CONFIG_BUG | 17 | #ifdef CONFIG_BUG |
| 17 | /* | 18 | /* |