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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
sound
/
core
/
oss
/
io.c
diff --git
a/sound/core/oss/io.c
b/sound/core/oss/io.c
index
322702e
..
b6e7ce3
100644
(file)
--- a/
sound/core/oss/io.c
+++ b/
sound/core/oss/io.c
@@
-20,6
+20,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>
@@
-132,3
+135,5
@@
int snd_pcm_plugin_build_io(struct snd_pcm_substream *plug,
*r_plugin = plugin;
return 0;
}
*r_plugin = plugin;
return 0;
}
+
+#endif