git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
core
/
oss
/
linear.c
diff --git
a/sound/core/oss/linear.c
b/sound/core/oss/linear.c
index
8cbfa41
..
5b1bcdc
100644
(file)
--- a/
sound/core/oss/linear.c
+++ b/
sound/core/oss/linear.c
@@
-21,6
+21,9
@@
*/
#include <sound/driver.h>
*/
#include <sound/driver.h>
+
+#ifdef CONFIG_SND_PCM_OSS_PLUGINS
+
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>
@@
-103,7
+106,7
@@
static snd_pcm_sframes_t linear_transfer(struct snd_pcm_plugin *plugin,
return frames;
}
return frames;
}
-int conv_index(int src_format, int dst_format)
+
static
int conv_index(int src_format, int dst_format)
{
int src_endian, dst_endian, sign, src_width, dst_width;
{
int src_endian, dst_endian, sign, src_width, dst_width;
@@
-156,3
+159,5
@@
int snd_pcm_plugin_build_linear(struct snd_pcm_substream *plug,
*r_plugin = plugin;
return 0;
}
*r_plugin = plugin;
return 0;
}
+
+#endif