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/abs_addr.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/abs_addr.h')
| -rw-r--r-- | include/asm-powerpc/abs_addr.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-powerpc/abs_addr.h b/include/asm-powerpc/abs_addr.h index 18415108fc56..c5c3259e0f86 100644 --- a/include/asm-powerpc/abs_addr.h +++ b/include/asm-powerpc/abs_addr.h | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #ifndef _ASM_POWERPC_ABS_ADDR_H | 1 | #ifndef _ASM_POWERPC_ABS_ADDR_H |
| 2 | #define _ASM_POWERPC_ABS_ADDR_H | 2 | #define _ASM_POWERPC_ABS_ADDR_H |
| 3 | #ifdef __KERNEL__ | ||
| 3 | 4 | ||
| 4 | #include <linux/config.h> | 5 | #include <linux/config.h> |
| 5 | 6 | ||
| @@ -70,4 +71,5 @@ static inline unsigned long phys_to_abs(unsigned long pa) | |||
| 70 | #define iseries_hv_addr(virtaddr) \ | 71 | #define iseries_hv_addr(virtaddr) \ |
| 71 | (0x8000000000000000 | virt_to_abs(virtaddr)) | 72 | (0x8000000000000000 | virt_to_abs(virtaddr)) |
| 72 | 73 | ||
| 74 | #endif /* __KERNEL__ */ | ||
| 73 | #endif /* _ASM_POWERPC_ABS_ADDR_H */ | 75 | #endif /* _ASM_POWERPC_ABS_ADDR_H */ |