diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /sound/core/oss/io.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
| download | kernel_samsung_aries-1ebbe2b20091d306453a5cf480a87e6cd28ae76f.zip kernel_samsung_aries-1ebbe2b20091d306453a5cf480a87e6cd28ae76f.tar.gz kernel_samsung_aries-1ebbe2b20091d306453a5cf480a87e6cd28ae76f.tar.bz2 | |
Merge branch 'linus'
Diffstat (limited to 'sound/core/oss/io.c')
| -rw-r--r-- | sound/core/oss/io.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/core/oss/io.c b/sound/core/oss/io.c index 322702e..b6e7ce3 100644 --- a/sound/core/oss/io.c +++ b/sound/core/oss/io.c @@ -20,6 +20,9 @@ */ #include <sound/driver.h> + +#ifdef CONFIG_SND_PCM_OSS_PLUGINS + #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; } + +#endif |