diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-09 10:43:48 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-09 10:43:48 +0000 |
| commit | 6d70934a0248d0d92e01116807c02c00ae172299 (patch) | |
| tree | 3e0693dec9cc0e82c3b91237ed06f49bbc76737c /include | |
| parent | 17c0cee96f9dd76604e617b74ccca701eebd9727 (diff) | |
| parent | 945e5038455fef18e73914c149717878d78cb4c0 (diff) | |
| download | linux-6d70934a0248d0d92e01116807c02c00ae172299.tar.bz2 | |
Merge branch 'topic/pcm-internal' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into for-3.4
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/pcm.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 0cf91b2f08ca..1d58d7957390 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -454,6 +454,7 @@ struct snd_pcm { void *private_data; void (*private_free) (struct snd_pcm *pcm); struct device *dev; /* actual hw device this belongs to */ + bool internal; /* pcm is for internal use only */ #if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE) struct snd_pcm_oss oss; #endif @@ -475,6 +476,9 @@ extern const struct file_operations snd_pcm_f_ops[2]; int snd_pcm_new(struct snd_card *card, const char *id, int device, int playback_count, int capture_count, struct snd_pcm **rpcm); +int snd_pcm_new_internal(struct snd_card *card, const char *id, int device, + int playback_count, int capture_count, + struct snd_pcm **rpcm); int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count); int snd_pcm_notify(struct snd_pcm_notify *notify, int nfree); |