aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-10 01:26:23 -0400
committerTakashi Iwai <tiwai@suse.de>2009-06-10 01:26:23 -0400
commitab2f06cb6b7cc4cb782387a19fbfed3dfe8a8436 (patch)
tree05daa9670d9cf1a474eb9cee948532f5f4afc8f0 /include/sound
parenta963203c18e5988506bd173b75ca002df528ed48 (diff)
parentc6e24d4db824d277303201811e88626778c59999 (diff)
Merge branch 'topic/caiaq' into for-linus
* topic/caiaq: ALSA: snd_usb_caiaq: bump version number ALSA: snd_usb_caiaq: give better shortname ALSA: Core - add snd_card_set_id() function ALSA: snd_usb_caiaq: give better longname ALSA: snd_usb_caiaq: use strlcpy ALSA: snd_usb_caiaq: clean whitespaces
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/core.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/core.h b/include/sound/core.h
index 3dea79829acc..0e8ae10155ab 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -313,6 +313,7 @@ struct snd_card *snd_card_new(int idx, const char *id,
313int snd_card_disconnect(struct snd_card *card); 313int snd_card_disconnect(struct snd_card *card);
314int snd_card_free(struct snd_card *card); 314int snd_card_free(struct snd_card *card);
315int snd_card_free_when_closed(struct snd_card *card); 315int snd_card_free_when_closed(struct snd_card *card);
316void snd_card_set_id(struct snd_card *card, const char *id);
316int snd_card_register(struct snd_card *card); 317int snd_card_register(struct snd_card *card);
317int snd_card_info_init(void); 318int snd_card_info_init(void);
318int snd_card_info_done(void); 319int snd_card_info_done(void);