-
- Downloads
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>
Showing
- arch/m68k/atari/ataints.c 8 additions, 8 deletionsarch/m68k/atari/ataints.c
- arch/m68k/atari/atakeyb.c 2 additions, 2 deletionsarch/m68k/atari/atakeyb.c
- arch/m68k/atari/config.c 1 addition, 1 deletionarch/m68k/atari/config.c
- arch/m68k/atari/debug.c 11 additions, 11 deletionsarch/m68k/atari/debug.c
- arch/m68k/atari/time.c 4 additions, 4 deletionsarch/m68k/atari/time.c
- arch/m68k/include/asm/atarihw.h 2 additions, 2 deletionsarch/m68k/include/asm/atarihw.h
- arch/m68k/include/asm/atariints.h 3 additions, 3 deletionsarch/m68k/include/asm/atariints.h
- drivers/block/ataflop.c 2 additions, 2 deletionsdrivers/block/ataflop.c
- drivers/char/scc.h 1 addition, 1 deletiondrivers/char/scc.h
- drivers/parport/parport_atari.c 3 additions, 3 deletionsdrivers/parport/parport_atari.c
- drivers/video/atafb.c 11 additions, 11 deletionsdrivers/video/atafb.c
- sound/oss/dmasound/dmasound_atari.c 8 additions, 8 deletionssound/oss/dmasound/dmasound_atari.c
Loading
Please register or sign in to comment