diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:19:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:19:53 -0400 |
| commit | 064a32d82c20cdcb0119a8b316eb520608d8c647 (patch) | |
| tree | c67d534bd4458b1482c11f11c724fe93beca4f80 /include/asm-mips/gic.h | |
| parent | 0327318445d55808991a63137cfb698a90ab6adf (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into x86/memtest
Diffstat (limited to 'include/asm-mips/gic.h')
| -rw-r--r-- | include/asm-mips/gic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/gic.h b/include/asm-mips/gic.h index 01b2f92dc33d..3a492f225f00 100644 --- a/include/asm-mips/gic.h +++ b/include/asm-mips/gic.h | |||
| @@ -330,7 +330,7 @@ | |||
| 330 | 330 | ||
| 331 | #define GIC_SH_RMASK_OFS 0x0300 | 331 | #define GIC_SH_RMASK_OFS 0x0300 |
| 332 | #define GIC_CLR_INTR_MASK(intr, val) \ | 332 | #define GIC_CLR_INTR_MASK(intr, val) \ |
| 333 | GICWRITE(GIC_REG_ADDR(SHARED, GIC_SH_RMASK_OFS + 4 + (((((intr) / 32) ^ 1) - 1) * 4)), ((val) << ((intr) % 32)) | 333 | GICWRITE(GIC_REG_ADDR(SHARED, GIC_SH_RMASK_OFS + 4 + (((((intr) / 32) ^ 1) - 1) * 4)), ((val) << ((intr) % 32))) |
| 334 | 334 | ||
| 335 | /* Register Map for Local Section */ | 335 | /* Register Map for Local Section */ |
| 336 | #define GIC_VPE_CTL_OFS 0x0000 | 336 | #define GIC_VPE_CTL_OFS 0x0000 |