m68k: atari - Rename "mfp" to "st_mfp"

http://kisskb.ellerman.id.au/kisskb/buildresult/72115/:
| net/mac80211/ieee80211_i.h:327: error: syntax error before 'volatile'
| net/mac80211/ieee80211_i.h:350: error: syntax error before '}' token
| net/mac80211/ieee80211_i.h:455: error: field 'sta' has incomplete type
| distcc[19430] ERROR: compile net/mac80211/main.c on sprygo/32 failed

This is caused by

| # define mfp ((*(volatile struct MFP*)MFP_BAS))

in arch/m68k/include/asm/atarihw.h, which conflicts with the new "mfp" enum in
net/mac80211/ieee80211_i.h.

Rename "mfp" to "st_mfp", as it's a way too generic name for a global #define.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

4 files changed, 17 insertions, 17 deletions

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 69e1df7dfa14..4234c11c1e4c 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -1730,7 +1730,7 @@ static int __init fd_test_drive_present( int drive )
 
         timeout = jiffies + 2*HZ+HZ/2;
         while (time_before(jiffies, timeout))
-                if (!(mfp.par_dt_reg & 0x20))
+                if (!(st_mfp.par_dt_reg & 0x20))
                         break;
 
         status = FDC_READ( FDCREG_STATUS );
@@ -1747,7 +1747,7 @@ static int __init fd_test_drive_present( int drive )
                 /* dummy seek command to make WP bit accessible */
                 FDC_WRITE( FDCREG_DATA, 0 );
                 FDC_WRITE( FDCREG_CMD, FDCCMD_SEEK );
-                while( mfp.par_dt_reg & 0x20 )
+                while( st_mfp.par_dt_reg & 0x20 )
                         ;
                 status = FDC_READ( FDCREG_STATUS );
         }
diff --git a/drivers/char/scc.h b/drivers/char/scc.h
index 93998f5baff5..341b1142bea8 100644
--- a/drivers/char/scc.h
+++ b/drivers/char/scc.h
@@ -387,7 +387,7 @@ struct scc_port {
 /* The SCC needs 3.5 PCLK cycles recovery time between to register
  * accesses. PCLK runs with 8 MHz on an Atari, so this delay is 3.5 *
  * 125 ns = 437.5 ns. This is too short for udelay().
- * 10/16/95: A tstb mfp.par_dt_reg takes 600ns (sure?) and thus should be
+ * 10/16/95: A tstb st_mfp.par_dt_reg takes 600ns (sure?) and thus should be
  * quite right
  */
 
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,
 static unsigned char
 parport_atari_read_status(struct parport *p)
 {
-        return ((mfp.par_dt_reg & 1 ? 0 : PARPORT_STATUS_BUSY) |
+        return ((st_mfp.par_dt_reg & 1 ? 0 : PARPORT_STATUS_BUSY) |
                 PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR);
 }
 
@@ -193,9 +193,9 @@ static int __init parport_atari_init(void)
                 sound_ym.wd_data = sound_ym.rd_data_reg_sel | (1 << 5);
                 local_irq_restore(flags);
                 /* MFP port I0 as input. */
-                mfp.data_dir &= ~1;
+                st_mfp.data_dir &= ~1;
                 /* MFP port I0 interrupt on high->low edge. */
-                mfp.active_edge &= ~1;
+                st_mfp.active_edge &= ~1;
                 p = parport_register_port((unsigned long)&sound_ym.wd_data,
                                           IRQ_MFP_BUSY, PARPORT_DMA_NONE,
                                           &parport_atari_ops);
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index 8058572a7428..018850c116c6 100644
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -841,7 +841,7 @@ static int tt_detect(void)
                 tt_dmasnd.ctrl = DMASND_CTRL_OFF;
                 udelay(20);             /* wait a while for things to settle down */
         }
-        mono_moni = (mfp.par_dt_reg & 0x80) == 0;
+        mono_moni = (st_mfp.par_dt_reg & 0x80) == 0;
 
         tt_get_par(&par);
         tt_encode_var(&atafb_predefined[0], &par);
@@ -2035,7 +2035,7 @@ static int stste_detect(void)
                 tt_dmasnd.ctrl = DMASND_CTRL_OFF;
                 udelay(20);             /* wait a while for things to settle down */
         }
-        mono_moni = (mfp.par_dt_reg & 0x80) == 0;
+        mono_moni = (st_mfp.par_dt_reg & 0x80) == 0;
 
         stste_get_par(&par);
         stste_encode_var(&atafb_predefined[0], &par);
@@ -2086,20 +2086,20 @@ static void st_ovsc_switch(void)
                 return;
         local_irq_save(flags);
 
-        mfp.tim_ct_b = 0x10;
-        mfp.active_edge |= 8;
-        mfp.tim_ct_b = 0;
-        mfp.tim_dt_b = 0xf0;
-        mfp.tim_ct_b = 8;
-        while (mfp.tim_dt_b > 1)        /* TOS does it this way, don't ask why */
+        st_mfp.tim_ct_b = 0x10;
+        st_mfp.active_edge |= 8;
+        st_mfp.tim_ct_b = 0;
+        st_mfp.tim_dt_b = 0xf0;
+        st_mfp.tim_ct_b = 8;
+        while (st_mfp.tim_dt_b > 1)     /* TOS does it this way, don't ask why */
                 ;
-        new = mfp.tim_dt_b;
+        new = st_mfp.tim_dt_b;
         do {
                 udelay(LINE_DELAY);
                 old = new;
-                new = mfp.tim_dt_b;
+                new = st_mfp.tim_dt_b;
         } while (old != new);
-        mfp.tim_ct_b = 0x10;
+        st_mfp.tim_ct_b = 0x10;
         udelay(SYNC_DELAY);
 
         if (atari_switches & ATARI_SWITCH_OVSC_IKBD)