diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/sound/mixer_oss.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/sound/mixer_oss.h')
| -rw-r--r-- | include/sound/mixer_oss.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/mixer_oss.h b/include/sound/mixer_oss.h index 51fbcb4a277a..13cb0b430a1b 100644 --- a/include/sound/mixer_oss.h +++ b/include/sound/mixer_oss.h | |||
| @@ -73,6 +73,9 @@ struct snd_mixer_oss_file { | |||
| 73 | struct snd_mixer_oss *mixer; | 73 | struct snd_mixer_oss *mixer; |
| 74 | }; | 74 | }; |
| 75 | 75 | ||
| 76 | int snd_mixer_oss_ioctl_card(struct snd_card *card, | ||
| 77 | unsigned int cmd, unsigned long arg); | ||
| 78 | |||
| 76 | #endif /* CONFIG_SND_MIXER_OSS */ | 79 | #endif /* CONFIG_SND_MIXER_OSS */ |
| 77 | 80 | ||
| 78 | #endif /* __SOUND_MIXER_OSS_H */ | 81 | #endif /* __SOUND_MIXER_OSS_H */ |