diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 04:06:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 12:09:00 -0500 |
| commit | b4290a23cfa9040e2f0de5ab57d6ea65abaf053b (patch) | |
| tree | 592b8ecd6a2a4b618c5de1a2573f79cd932df31e /sound/oss | |
| parent | 198a4101197797fd9cee40c17dc285dc84c5d745 (diff) | |
[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>
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/dmasound/dmasound_paula.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/oss/dmasound/dmasound_paula.c b/sound/oss/dmasound/dmasound_paula.c index d59f60b26410..f163868e7526 100644 --- a/sound/oss/dmasound/dmasound_paula.c +++ b/sound/oss/dmasound/dmasound_paula.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #define DMASOUND_PAULA_REVISION 0 | 34 | #define DMASOUND_PAULA_REVISION 0 |
| 35 | #define DMASOUND_PAULA_EDITION 4 | 35 | #define DMASOUND_PAULA_EDITION 4 |
| 36 | 36 | ||
| 37 | #define custom amiga_custom | ||
| 37 | /* | 38 | /* |
| 38 | * The minimum period for audio depends on htotal (for OCS/ECS/AGA) | 39 | * The minimum period for audio depends on htotal (for OCS/ECS/AGA) |
| 39 | * (Imported from arch/m68k/amiga/amisound.c) | 40 | * (Imported from arch/m68k/amiga/amisound.c) |