diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /include/asm-mips/sibyte/sb1250_scd.h | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-mips/sibyte/sb1250_scd.h')
| -rw-r--r-- | include/asm-mips/sibyte/sb1250_scd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/sibyte/sb1250_scd.h b/include/asm-mips/sibyte/sb1250_scd.h index f4178bdcfcb0..7ed0bb611e56 100644 --- a/include/asm-mips/sibyte/sb1250_scd.h +++ b/include/asm-mips/sibyte/sb1250_scd.h | |||
| @@ -149,7 +149,7 @@ | |||
| 149 | * (For the assembler version, sysrev and dest may be the same register. | 149 | * (For the assembler version, sysrev and dest may be the same register. |
| 150 | * Also, it clobbers AT.) | 150 | * Also, it clobbers AT.) |
| 151 | */ | 151 | */ |
| 152 | #ifdef __ASSEMBLER__ | 152 | #ifdef __ASSEMBLY__ |
| 153 | #define SYS_SOC_TYPE(dest, sysrev) \ | 153 | #define SYS_SOC_TYPE(dest, sysrev) \ |
| 154 | .set push ; \ | 154 | .set push ; \ |
| 155 | .set reorder ; \ | 155 | .set reorder ; \ |