aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-30 10:47:01 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-30 10:47:01 -0400
commit444bd6fc18e4788f701a119cdfefe4f02444d9cb (patch)
tree605ad11a825acf4bae9d98973becb3977ac2bae5 /include/linux
parent3cb904caa97f5c193df21b8cdf780a826564baff (diff)
parentc88469704d63787e8d44ca5ea1c1bd0adc29572d (diff)
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/sound.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/sound.h b/include/linux/sound.h
index 428f59794f48..72b9af4c3fd4 100644
--- a/include/linux/sound.h
+++ b/include/linux/sound.h
@@ -29,7 +29,9 @@
29 * Sound core interface functions 29 * Sound core interface functions
30 */ 30 */
31 31
32struct device;
32extern int register_sound_special(struct file_operations *fops, int unit); 33extern int register_sound_special(struct file_operations *fops, int unit);
34extern int register_sound_special_device(struct file_operations *fops, int unit, struct device *dev);
33extern int register_sound_mixer(struct file_operations *fops, int dev); 35extern int register_sound_mixer(struct file_operations *fops, int dev);
34extern int register_sound_midi(struct file_operations *fops, int dev); 36extern int register_sound_midi(struct file_operations *fops, int dev);
35extern int register_sound_dsp(struct file_operations *fops, int dev); 37extern int register_sound_dsp(struct file_operations *fops, int dev);