diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-01 15:24:37 (GMT) |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-01 15:24:37 (GMT) |
| commit | 2683e88413977a7f382106f8e8b3b684a597c761 (patch) | |
| tree | 96f56121c3afed843fb705cbc75aa85cf9038fd0 /include/sound/pcm_oss.h | |
| parent | b07019f29328ebb1b48d3faf952b84f07ec9b973 (diff) | |
| parent | 9f29333dae3488542b1344871e8ecb84084ad80e (diff) | |
| download | linux-fsl-qoriq-2683e88413977a7f382106f8e8b3b684a597c761.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Reverting c7afb48eb5147be9eb9789b4161462d246451ac2 since a better (but
more intrusive) fix is now merged upstream.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/sound/pcm_oss.h')
| -rw-r--r-- | include/sound/pcm_oss.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/pcm_oss.h b/include/sound/pcm_oss.h index 39df2ba..c854647 100644 --- a/include/sound/pcm_oss.h +++ b/include/sound/pcm_oss.h @@ -75,7 +75,9 @@ struct snd_pcm_oss_substream { struct snd_pcm_oss_stream { struct snd_pcm_oss_setup *setup_list; /* setup list */ struct mutex setup_mutex; +#ifdef CONFIG_SND_VERBOSE_PROCFS struct snd_info_entry *proc_entry; +#endif }; struct snd_pcm_oss { |