Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / sound / core / oss / copy.c

diff --git a/sound/core/oss/copy.c b/sound/core/oss/copy.c
index edecbe7..6658fac 100644 (file)
--- a/sound/core/oss/copy.c
+++ b/sound/core/oss/copy.c
@@ -20,14 +20,17 @@
  */
 
 #include <sound/driver.h>
+
+#ifdef CONFIG_SND_PCM_OSS_PLUGINS
+
 #include <linux/time.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include "pcm_plugin.h"
 
-static snd_pcm_sframes_t copy_transfer(snd_pcm_plugin_t *plugin,
-                            const snd_pcm_plugin_channel_t *src_channels,
-                            snd_pcm_plugin_channel_t *dst_channels,
+static snd_pcm_sframes_t copy_transfer(struct snd_pcm_plugin *plugin,
+                            const struct snd_pcm_plugin_channel *src_channels,
+                            struct snd_pcm_plugin_channel *dst_channels,
                             snd_pcm_uframes_t frames)
 {
        unsigned int channel;
@@ -58,13 +61,13 @@ static snd_pcm_sframes_t copy_transfer(snd_pcm_plugin_t *plugin,
        return frames;
 }
 
-int snd_pcm_plugin_build_copy(snd_pcm_plug_t *plug,
-                             snd_pcm_plugin_format_t *src_format,
-                             snd_pcm_plugin_format_t *dst_format,
-                             snd_pcm_plugin_t **r_plugin)
+int snd_pcm_plugin_build_copy(struct snd_pcm_substream *plug,
+                             struct snd_pcm_plugin_format *src_format,
+                             struct snd_pcm_plugin_format *dst_format,
+                             struct snd_pcm_plugin **r_plugin)
 {
        int err;
-       snd_pcm_plugin_t *plugin;
+       struct snd_pcm_plugin *plugin;
        int width;
 
        snd_assert(r_plugin != NULL, return -ENXIO);
@@ -85,3 +88,5 @@ int snd_pcm_plugin_build_copy(snd_pcm_plug_t *plug,
        *r_plugin = plugin;
        return 0;
 }
+
+#endif