diff options
| author | Ulf Carlsson <md1ulfc@mdstud.chalmers.se> | 1999-01-27 21:13:01 +0000 |
|---|---|---|
| committer | Ulf Carlsson <md1ulfc@mdstud.chalmers.se> | 1999-01-27 21:13:01 +0000 |
| commit | 4274d6c167aace65441d6d2a241a800616b0c34f (patch) | |
| tree | 252f00a1100d6593b36da16d3cba5db3f3011d73 /drivers/sgi | |
| parent | 39fff4cfaac5dffb634f0f7a6c6edd0093461946 (diff) | |
forgot some stupid volatile *duh*
Diffstat (limited to 'drivers/sgi')
| -rw-r--r-- | drivers/sgi/audio/hal2.c | 5 | ||||
| -rw-r--r-- | drivers/sgi/audio/hal2.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/sgi/audio/hal2.c b/drivers/sgi/audio/hal2.c index 4d931d24f..37dbd84d3 100644 --- a/drivers/sgi/audio/hal2.c +++ b/drivers/sgi/audio/hal2.c @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: hal2.c,v 1.3 1999/01/27 19:33:48 ulfc Exp $ * * drivers/sgi/audio/hal2.c * @@ -60,9 +60,6 @@ struct hal2_channel { }; struct hal2_private { - volatile struct hal2_ctrl_regs *regs; - volatile struct hal2_volume_regs *volume; - struct hal2_buffer *dac_head; struct hal2_buffer *adc_tail; diff --git a/drivers/sgi/audio/hal2.h b/drivers/sgi/audio/hal2.h index bfbd74f9b..b0755ed17 100644 --- a/drivers/sgi/audio/hal2.h +++ b/drivers/sgi/audio/hal2.h @@ -11,7 +11,7 @@ #define H2_VOLUME_PIO (H2_HAL2_BASE + 2 * 0x200) #define H2_SYNTH_PIO (H2_HAL2_BASE + 3 * 0x200) -typedef unsigned short hal_reg; +typedef volatile unsigned short hal_reg; struct hal2_ctrl_regs { hal_reg _unused0[8]; |