Geert Uytterhoeven 3d92e8f3ae 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>		2009-02-22 09:23:02 -08:00
..
aoa	Merge branch 'topic/aoa' into to-push	2008-12-25 11:40:24 +01:00
arm	[ARM] AACI: timeout will reach -1	2009-02-10 09:59:20 +00:00
core	ALSA: jack - Use card->shortname for input name	2009-02-18 16:46:27 +01:00
drivers	ALSA: mtpav - Fix initial value for input hwport	2009-02-12 00:06:42 +01:00
i2c	V4L/DVB (10138): v4l2-ioctl: change to long return type to match unlocked_ioctl.	2009-01-02 17:11:34 -02:00
isa	Merge branch 'topic/pcsp-fix' into topic/misc	2008-12-20 23:39:47 +01:00
mips	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
oss	m68k: atari - Rename "mfp" to "st_mfp"	2009-02-22 09:23:02 -08:00
parisc	ALSA: harmony - fix a typo	2008-09-04 10:33:55 +02:00
pci	Merge branch 'fix/misc' into for-linus	2009-02-19 13:58:01 +01:00
pcmcia	ALSA: hda - Convert from takslet_hi_schedule() to tasklet_schedule()	2008-12-18 12:17:55 +01:00
ppc	powerpc/ps3: Printing fixups for l64 to ll64 conversion sound/ppc	2009-01-16 16:15:14 +11:00
sh	ALSA: Fix section for snd-aica platform driver	2008-09-23 08:17:58 +02:00
soc	ASoC: Only register AC97 bus if it's not done already	2009-02-13 13:50:22 +00:00
sparc	sparc64: Fix unsigned long long warnings in drivers.	2009-01-06 13:20:38 -08:00
spi	sound: Convert to menuconfig	2008-05-27 15:56:20 +02:00
synth	ALSA: Kill snd_assert() in other places	2008-08-13 11:46:40 +02:00
usb	ALSA: usb-audio - Workaround for misdetected sample rate with CM6207	2009-02-16 22:58:23 +01:00
ac97_bus.c	ALSA: ac97 - Include ac97_codec.h for ac97_bus_type declaration	2008-12-02 16:25:37 +01:00
Kconfig	Fix CONFIG_AC97_BUS dependency	2008-09-06 11:43:41 +02:00
last.c
Makefile
sound_core.c	ALSA: Fix declaration of sound_class	2008-12-15 16:55:27 +01:00
sound_firmware.c