diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-23 08:14:02 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-23 08:14:02 -0400 |
| commit | 3372dbdd8ca11f51be8c6a30b2bc79eb04c4a902 (patch) | |
| tree | d4499bf5a5665b4820ffaf96bce55bf6b895195e /include/sound/core.h | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
| parent | 967b1307b69b8ada8b331e01046ad1ef83742e99 (diff) | |
Merge branch 'for-next' into topic/hda-core
Diffstat (limited to 'include/sound/core.h')
| -rw-r--r-- | include/sound/core.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index da5748289968..b12931f513f4 100644 --- a/include/sound/core.h +++ b/include/sound/core.h | |||
| @@ -278,7 +278,8 @@ int snd_device_new(struct snd_card *card, enum snd_device_type type, | |||
| 278 | void *device_data, struct snd_device_ops *ops); | 278 | void *device_data, struct snd_device_ops *ops); |
| 279 | int snd_device_register(struct snd_card *card, void *device_data); | 279 | int snd_device_register(struct snd_card *card, void *device_data); |
| 280 | int snd_device_register_all(struct snd_card *card); | 280 | int snd_device_register_all(struct snd_card *card); |
| 281 | int snd_device_disconnect_all(struct snd_card *card); | 281 | void snd_device_disconnect(struct snd_card *card, void *device_data); |
| 282 | void snd_device_disconnect_all(struct snd_card *card); | ||
| 282 | void snd_device_free(struct snd_card *card, void *device_data); | 283 | void snd_device_free(struct snd_card *card, void *device_data); |
| 283 | void snd_device_free_all(struct snd_card *card); | 284 | void snd_device_free_all(struct snd_card *card); |
| 284 | 285 | ||