aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/jack.h1
-rw-r--r--include/sound/pcm.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/jack.h b/include/sound/jack.h
index c140fc7cbd3f..63c790742db4 100644
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -42,6 +42,7 @@ enum snd_jack_types {
42 SND_JACK_MECHANICAL = 0x0008, /* If detected separately */ 42 SND_JACK_MECHANICAL = 0x0008, /* If detected separately */
43 SND_JACK_VIDEOOUT = 0x0010, 43 SND_JACK_VIDEOOUT = 0x0010,
44 SND_JACK_AVOUT = SND_JACK_LINEOUT | SND_JACK_VIDEOOUT, 44 SND_JACK_AVOUT = SND_JACK_LINEOUT | SND_JACK_VIDEOOUT,
45 SND_JACK_LINEIN = 0x0020,
45 46
46 /* Kept separate from switches to facilitate implementation */ 47 /* Kept separate from switches to facilitate implementation */
47 SND_JACK_BTN_0 = 0x4000, 48 SND_JACK_BTN_0 = 0x4000,
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index dc36f756fe8d..3e7fda6e8164 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -1037,6 +1037,8 @@ static inline void snd_pcm_mmap_data_close(struct vm_area_struct *area)
1037 atomic_dec(&substream->mmap_count); 1037 atomic_dec(&substream->mmap_count);
1038} 1038}
1039 1039
1040int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream,
1041 struct vm_area_struct *area);
1040/* mmap for io-memory area */ 1042/* mmap for io-memory area */
1041#if defined(CONFIG_X86) || defined(CONFIG_PPC) || defined(CONFIG_ALPHA) 1043#if defined(CONFIG_X86) || defined(CONFIG_PPC) || defined(CONFIG_ALPHA)
1042#define SNDRV_PCM_INFO_MMAP_IOMEM SNDRV_PCM_INFO_MMAP 1044#define SNDRV_PCM_INFO_MMAP_IOMEM SNDRV_PCM_INFO_MMAP