diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
| commit | 0a3a98f6dd4e8f4d928a09302c0d1c56f2192ac3 (patch) | |
| tree | 92f55e374a84d06ce8213a4540454760fdecf137 /sound/isa/wavefront/wavefront_synth.c | |
| parent | 8ef12c9f01afba47c2d33bb939085111ca0d0f7d (diff) | |
| parent | 5367f2d67c7d0bf1faae90e6e7b4e2ac3c9b5e0f (diff) | |
Merge Linus' tree.
Diffstat (limited to 'sound/isa/wavefront/wavefront_synth.c')
| -rw-r--r-- | sound/isa/wavefront/wavefront_synth.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c index 679d0ae97e4f..ed81eec6e732 100644 --- a/sound/isa/wavefront/wavefront_synth.c +++ b/sound/isa/wavefront/wavefront_synth.c | |||
| @@ -115,18 +115,11 @@ MODULE_PARM_DESC(osrun_time, "how many seconds to wait for the ICS2115 OS"); | |||
| 115 | 115 | ||
| 116 | #ifdef WF_DEBUG | 116 | #ifdef WF_DEBUG |
| 117 | 117 | ||
| 118 | #if defined(NEW_MACRO_VARARGS) || __GNUC__ >= 3 | ||
| 119 | #define DPRINT(cond, ...) \ | 118 | #define DPRINT(cond, ...) \ |
| 120 | if ((dev->debug & (cond)) == (cond)) { \ | 119 | if ((dev->debug & (cond)) == (cond)) { \ |
| 121 | snd_printk (__VA_ARGS__); \ | 120 | snd_printk (__VA_ARGS__); \ |
| 122 | } | 121 | } |
| 123 | #else | 122 | #else |
| 124 | #define DPRINT(cond, args...) \ | ||
| 125 | if ((dev->debug & (cond)) == (cond)) { \ | ||
| 126 | snd_printk (args); \ | ||
| 127 | } | ||
| 128 | #endif | ||
| 129 | #else | ||
| 130 | #define DPRINT(cond, args...) | 123 | #define DPRINT(cond, args...) |
| 131 | #endif /* WF_DEBUG */ | 124 | #endif /* WF_DEBUG */ |
| 132 | 125 | ||