diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-28 00:13:53 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-28 00:13:53 +0200 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /include/asm-mips/sibyte/sb1250_scd.h | |
| parent | Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 ... (diff) | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b.tar.xz linux-aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b.zip | |
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 @@ * (For the assembler version, sysrev and dest may be the same register. * Also, it clobbers AT.) */ -#ifdef __ASSEMBLER__ +#ifdef __ASSEMBLY__ #define SYS_SOC_TYPE(dest, sysrev) \ .set push ; \ .set reorder ; \ |