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/ohare.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/ohare.h')
| -rw-r--r-- | include/asm-powerpc/ohare.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-powerpc/ohare.h b/include/asm-powerpc/ohare.h index 023b59772231..0d030f9dea24 100644 --- a/include/asm-powerpc/ohare.h +++ b/include/asm-powerpc/ohare.h | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | #ifndef _ASM_POWERPC_OHARE_H | ||
| 2 | #define _ASM_POWERPC_OHARE_H | ||
| 3 | #ifdef __KERNEL__ | ||
| 1 | /* | 4 | /* |
| 2 | * ohare.h: definitions for using the "O'Hare" I/O controller chip. | 5 | * ohare.h: definitions for using the "O'Hare" I/O controller chip. |
| 3 | * | 6 | * |
| @@ -46,3 +49,6 @@ | |||
| 46 | * Contributed by Harry Eaton. | 49 | * Contributed by Harry Eaton. |
| 47 | */ | 50 | */ |
| 48 | #define STARMAX_FEATURES 0xbeff7a | 51 | #define STARMAX_FEATURES 0xbeff7a |
| 52 | |||
| 53 | #endif /* __KERNEL__ */ | ||
| 54 | #endif /* _ASM_POWERPC_OHARE_H */ | ||