commit b4290a23cfa9040e2f0de5ab57d6ea65abaf053b
author Al Viro <viro@ftp.linux.org.uk> Thu Jan 12 01:06:12 2006 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> Thu Jan 12 09:09:00 2006 -0800
tree 592b8ecd6a2a4b618c5de1a2573f79cd932df31e
parent 198a4101197797fd9cee40c17dc285dc84c5d745

[PATCH] m68k: namespace pollution fix (custom->amiga_custom)

in amigahw.h custom renamed to amiga_custom, in drivers with few instances the
same replacement, in the rest - #define custom amiga_custom in driver itself

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

sound/oss/dmasound/dmasound_paula.c

diff --git a/sound/oss/dmasound/dmasound_paula.c b/sound/oss/dmasound/dmasound_paula.c
index d59f60b..f163868 100644
--- a/sound/oss/dmasound/dmasound_paula.c
+++ b/sound/oss/dmasound/dmasound_paula.c
@@ -34,6 +34,7 @@
 #define DMASOUND_PAULA_REVISION 0
 #define DMASOUND_PAULA_EDITION 4
 
+#define custom amiga_custom
    /*
     *	The minimum period for audio depends on htotal (for OCS/ECS/AGA)
     *	(Imported from arch/m68k/amiga/amisound.c)