diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
| commit | 6150c32589d1976ca8a5c987df951088c05a7542 (patch) | |
| tree | 94073696576323ff966e365d8c47b8ecd8372f97 /include/asm-powerpc/bug.h | |
| parent | 44637a12f80b80157d9c1bc5b7d6ef09c9e05713 (diff) | |
| parent | be42d5fa3772241b8ecebd443f1fb36247959c54 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include/asm-powerpc/bug.h')
| -rw-r--r-- | include/asm-powerpc/bug.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-powerpc/bug.h b/include/asm-powerpc/bug.h index b001ecb3cd99..99817a802ca4 100644 --- a/include/asm-powerpc/bug.h +++ b/include/asm-powerpc/bug.h | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #ifndef _ASM_POWERPC_BUG_H | 1 | #ifndef _ASM_POWERPC_BUG_H |
| 2 | #define _ASM_POWERPC_BUG_H | 2 | #define _ASM_POWERPC_BUG_H |
| 3 | #ifdef __KERNEL__ | ||
| 3 | 4 | ||
| 4 | #include <asm/asm-compat.h> | 5 | #include <asm/asm-compat.h> |
| 5 | /* | 6 | /* |
| @@ -67,4 +68,5 @@ struct bug_entry *find_bug(unsigned long bugaddr); | |||
| 67 | 68 | ||
| 68 | #include <asm-generic/bug.h> | 69 | #include <asm-generic/bug.h> |
| 69 | 70 | ||
| 71 | #endif /* __KERNEL__ */ | ||
| 70 | #endif /* _ASM_POWERPC_BUG_H */ | 72 | #endif /* _ASM_POWERPC_BUG_H */ |