diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-06-12 09:53:34 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-12 09:53:34 +0200 |
| commit | 7a0c58d0513c246ac5438ef4a55ce8b93395ae0e (patch) | |
| tree | d18f58349ced242aa62e622e381e60933f71d451 /arch/mips/sgi-ip32/ip32-irq.c | |
| parent | powerpc: add context.vdso_base for 32-bit too (diff) | |
| parent | [PATCH] Fix for the PPTP hangs that have been reported (diff) | |
| download | linux-7a0c58d0513c246ac5438ef4a55ce8b93395ae0e.tar.xz linux-7a0c58d0513c246ac5438ef4a55ce8b93395ae0e.zip | |
Merge branch 'merge'
Diffstat (limited to 'arch/mips/sgi-ip32/ip32-irq.c')
| -rw-r--r-- | arch/mips/sgi-ip32/ip32-irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c index de01c9815bdd..8ba08047d164 100644 --- a/arch/mips/sgi-ip32/ip32-irq.c +++ b/arch/mips/sgi-ip32/ip32-irq.c @@ -31,12 +31,12 @@ /* issue a PIO read to make sure no PIO writes are pending */ static void inline flush_crime_bus(void) { - volatile unsigned long junk = crime->control; + crime->control; } static void inline flush_mace_bus(void) { - volatile unsigned long junk = mace->perif.ctrl.misc; + mace->perif.ctrl.misc; } #undef DEBUG_IRQ |