diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-10 13:43:09 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-10 13:43:09 -0400 |
| commit | a7144b23da073f4b3192e356ad74de12aba60e00 (patch) | |
| tree | 2b93bdf54563bfe447a167d832c43d24f56c7a95 /include/asm-ppc/ppc_asm.h | |
| parent | 8a60a07129fad60bba779a2a4038c7518b167fc7 (diff) | |
| parent | 86b3786078d63242d3194ffc58ae8dae1d1bbef3 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-ppc/ppc_asm.h')
| -rw-r--r-- | include/asm-ppc/ppc_asm.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-ppc/ppc_asm.h b/include/asm-ppc/ppc_asm.h index f76221def484..bb53e2def363 100644 --- a/include/asm-ppc/ppc_asm.h +++ b/include/asm-ppc/ppc_asm.h | |||
| @@ -186,6 +186,12 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601) | |||
| 186 | #define PPC405_ERR77_SYNC | 186 | #define PPC405_ERR77_SYNC |
| 187 | #endif | 187 | #endif |
| 188 | 188 | ||
| 189 | #ifdef CONFIG_IBM440EP_ERR42 | ||
| 190 | #define PPC440EP_ERR42 isync | ||
| 191 | #else | ||
| 192 | #define PPC440EP_ERR42 | ||
| 193 | #endif | ||
| 194 | |||
| 189 | /* The boring bits... */ | 195 | /* The boring bits... */ |
| 190 | 196 | ||
| 191 | /* Condition Register Bit Fields */ | 197 | /* Condition Register Bit Fields */ |