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/hardirq.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/hardirq.h')
| -rw-r--r-- | include/asm-powerpc/hardirq.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-powerpc/hardirq.h b/include/asm-powerpc/hardirq.h index 3b3e3b49ec12..288e14d53b7f 100644 --- a/include/asm-powerpc/hardirq.h +++ b/include/asm-powerpc/hardirq.h | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #ifndef _ASM_POWERPC_HARDIRQ_H | 1 | #ifndef _ASM_POWERPC_HARDIRQ_H |
| 2 | #define _ASM_POWERPC_HARDIRQ_H | 2 | #define _ASM_POWERPC_HARDIRQ_H |
| 3 | #ifdef __KERNEL__ | ||
| 3 | 4 | ||
| 4 | #include <asm/irq.h> | 5 | #include <asm/irq.h> |
| 5 | #include <asm/bug.h> | 6 | #include <asm/bug.h> |
| @@ -24,4 +25,5 @@ static inline void ack_bad_irq(int irq) | |||
| 24 | BUG(); | 25 | BUG(); |
| 25 | } | 26 | } |
| 26 | 27 | ||
| 28 | #endif /* __KERNEL__ */ | ||
| 27 | #endif /* _ASM_POWERPC_HARDIRQ_H */ | 29 | #endif /* _ASM_POWERPC_HARDIRQ_H */ |