diff options
Diffstat (limited to 'drivers/parport')
-rw-r--r-- | drivers/parport/parport_atari.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/parport/parport_atari.c b/drivers/parport/parport_atari.c index ad4cdd256137..0b28fccec03f 100644 --- a/drivers/parport/parport_atari.c +++ b/drivers/parport/parport_atari.c | |||
@@ -84,7 +84,7 @@ parport_atari_frob_control(struct parport *p, unsigned char mask, | |||
84 | static unsigned char | 84 | static unsigned char |
85 | parport_atari_read_status(struct parport *p) | 85 | parport_atari_read_status(struct parport *p) |
86 | { | 86 | { |
87 | return ((mfp.par_dt_reg & 1 ? 0 : PARPORT_STATUS_BUSY) | | 87 | return ((st_mfp.par_dt_reg & 1 ? 0 : PARPORT_STATUS_BUSY) | |
88 | PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR); | 88 | PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR); |
89 | } | 89 | } |
90 | 90 | ||
@@ -193,9 +193,9 @@ static int __init parport_atari_init(void) | |||
193 | sound_ym.wd_data = sound_ym.rd_data_reg_sel | (1 << 5); | 193 | sound_ym.wd_data = sound_ym.rd_data_reg_sel | (1 << 5); |
194 | local_irq_restore(flags); | 194 | local_irq_restore(flags); |
195 | /* MFP port I0 as input. */ | 195 | /* MFP port I0 as input. */ |
196 | mfp.data_dir &= ~1; | 196 | st_mfp.data_dir &= ~1; |
197 | /* MFP port I0 interrupt on high->low edge. */ | 197 | /* MFP port I0 interrupt on high->low edge. */ |
198 | mfp.active_edge &= ~1; | 198 | st_mfp.active_edge &= ~1; |
199 | p = parport_register_port((unsigned long)&sound_ym.wd_data, | 199 | p = parport_register_port((unsigned long)&sound_ym.wd_data, |
200 | IRQ_MFP_BUSY, PARPORT_DMA_NONE, | 200 | IRQ_MFP_BUSY, PARPORT_DMA_NONE, |
201 | &parport_atari_ops); | 201 | &parport_atari_ops); |