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/asm-compat.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/asm-compat.h')
| -rw-r--r-- | include/asm-powerpc/asm-compat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-powerpc/asm-compat.h b/include/asm-powerpc/asm-compat.h index 8b133efc9f79..8e64be0cc47d 100644 --- a/include/asm-powerpc/asm-compat.h +++ b/include/asm-powerpc/asm-compat.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_POWERPC_ASM_COMPAT_H | 1 | #ifndef _ASM_POWERPC_ASM_COMPAT_H |
| 2 | #define _ASM_POWERPC_ASM_COMPAT_H | 2 | #define _ASM_POWERPC_ASM_COMPAT_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/types.h> | 4 | #include <asm/types.h> |
| 6 | 5 | ||
| 7 | #ifdef __ASSEMBLY__ | 6 | #ifdef __ASSEMBLY__ |
| @@ -41,6 +40,7 @@ | |||
| 41 | 40 | ||
| 42 | #endif | 41 | #endif |
| 43 | 42 | ||
| 43 | #ifdef __KERNEL__ | ||
| 44 | #ifdef CONFIG_IBM405_ERR77 | 44 | #ifdef CONFIG_IBM405_ERR77 |
| 45 | /* Erratum #77 on the 405 means we need a sync or dcbt before every | 45 | /* Erratum #77 on the 405 means we need a sync or dcbt before every |
| 46 | * stwcx. The old ATOMIC_SYNC_FIX covered some but not all of this. | 46 | * stwcx. The old ATOMIC_SYNC_FIX covered some but not all of this. |
| @@ -51,5 +51,6 @@ | |||
| 51 | #define PPC405_ERR77(ra,rb) | 51 | #define PPC405_ERR77(ra,rb) |
| 52 | #define PPC405_ERR77_SYNC | 52 | #define PPC405_ERR77_SYNC |
| 53 | #endif | 53 | #endif |
| 54 | #endif | ||
| 54 | 55 | ||
| 55 | #endif /* _ASM_POWERPC_ASM_COMPAT_H */ | 56 | #endif /* _ASM_POWERPC_ASM_COMPAT_H */ |