]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
m68k: atari - Rename "mfp" to "st_mfp"
authorGeert Uytterhoeven <geert@linux-m68k.org>
Sun, 22 Feb 2009 08:38:47 +0000 (09:38 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Feb 2009 17:23:02 +0000 (09:23 -0800)
commit3d92e8f3ae9ba21cac30370eb254ed9dc20df043
treea0d7ebe8ed8d0aed414b235b7e7055d94f0e7459
parentadfafefd104d840ee4461965f22624d77532675b
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>
12 files changed:
arch/m68k/atari/ataints.c
arch/m68k/atari/atakeyb.c
arch/m68k/atari/config.c
arch/m68k/atari/debug.c
arch/m68k/atari/time.c
arch/m68k/include/asm/atarihw.h
arch/m68k/include/asm/atariints.h
drivers/block/ataflop.c
drivers/char/scc.h
drivers/parport/parport_atari.c
drivers/video/atafb.c
sound/oss/dmasound/dmasound_atari.c