diff options
Diffstat (limited to 'include/sound/core.h')
-rw-r--r-- | include/sound/core.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index f00b9c9b567f..f557c8ac450e 100644 --- a/include/sound/core.h +++ b/include/sound/core.h | |||
@@ -185,8 +185,8 @@ static inline int snd_power_wait(struct snd_card *card, unsigned int state, stru | |||
185 | struct snd_minor { | 185 | struct snd_minor { |
186 | struct list_head list; /* list of all minors per card */ | 186 | struct list_head list; /* list of all minors per card */ |
187 | int number; /* minor number */ | 187 | int number; /* minor number */ |
188 | int type; /* SNDRV_DEVICE_TYPE_XXX */ | ||
188 | int device; /* device number */ | 189 | int device; /* device number */ |
189 | const char *comment; /* for /proc/asound/devices */ | ||
190 | struct file_operations *f_ops; /* file operations */ | 190 | struct file_operations *f_ops; /* file operations */ |
191 | char name[0]; /* device name (keep at the end of | 191 | char name[0]; /* device name (keep at the end of |
192 | structure) */ | 192 | structure) */ |
@@ -199,11 +199,13 @@ extern int snd_ecards_limit; | |||
199 | 199 | ||
200 | void snd_request_card(int card); | 200 | void snd_request_card(int card); |
201 | 201 | ||
202 | int snd_register_device(int type, struct snd_card *card, int dev, struct snd_minor *reg, const char *name); | 202 | int snd_register_device(int type, struct snd_card *card, int dev, |
203 | struct file_operations *f_ops, const char *name); | ||
203 | int snd_unregister_device(int type, struct snd_card *card, int dev); | 204 | int snd_unregister_device(int type, struct snd_card *card, int dev); |
204 | 205 | ||
205 | #ifdef CONFIG_SND_OSSEMUL | 206 | #ifdef CONFIG_SND_OSSEMUL |
206 | int snd_register_oss_device(int type, struct snd_card *card, int dev, struct snd_minor *reg, const char *name); | 207 | int snd_register_oss_device(int type, struct snd_card *card, int dev, |
208 | struct file_operations *f_ops, const char *name); | ||
207 | int snd_unregister_oss_device(int type, struct snd_card *card, int dev); | 209 | int snd_unregister_oss_device(int type, struct snd_card *card, int dev); |
208 | #endif | 210 | #endif |
209 | 211 | ||