diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-08 15:24:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-08 15:24:46 -0400 |
| commit | d15a88fc21ef225768ce31be16edfc9c6e2e02e3 (patch) | |
| tree | d4cb0a1bc97973bb947e2667ae56bc4bc2256e9d /arch/mips/sgi-ip32 | |
| parent | b53471711f21ba0e151075f0e1d6d531eb50f1b1 (diff) | |
| parent | 1def630a6a49dda5bc89dfbd86656293640456f0 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/mips/sgi-ip32')
| -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 @@ | |||
| 31 | /* issue a PIO read to make sure no PIO writes are pending */ | 31 | /* issue a PIO read to make sure no PIO writes are pending */ |
| 32 | static void inline flush_crime_bus(void) | 32 | static void inline flush_crime_bus(void) |
| 33 | { | 33 | { |
| 34 | volatile unsigned long junk = crime->control; | 34 | crime->control; |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | static void inline flush_mace_bus(void) | 37 | static void inline flush_mace_bus(void) |
| 38 | { | 38 | { |
| 39 | volatile unsigned long junk = mace->perif.ctrl.misc; | 39 | mace->perif.ctrl.misc; |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | #undef DEBUG_IRQ | 42 | #undef DEBUG_IRQ |