diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:59 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:59 +0100 |
| commit | a3c6048dcfe3d7015e591b81c547b6df707b0859 (patch) | |
| tree | 88262502d8c2d4886887380818291629fdc53c0b /include/sound | |
| parent | 87cd9d7c8501e5da79de542340208b5f6ab4e1a4 (diff) | |
| parent | cda9043d56cee9fea39e4ee33fd605ae477a1950 (diff) | |
Merge branch 'topic/cs423x-merge' into for-linus
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/ad1816a.h | 2 | ||||
| -rw-r--r-- | include/sound/wss.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/ad1816a.h b/include/sound/ad1816a.h index b3aa62ee3c8d..d010858c33c2 100644 --- a/include/sound/ad1816a.h +++ b/include/sound/ad1816a.h @@ -169,5 +169,7 @@ extern int snd_ad1816a_create(struct snd_card *card, unsigned long port, extern int snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_pcm **rpcm); extern int snd_ad1816a_mixer(struct snd_ad1816a *chip); +extern int snd_ad1816a_timer(struct snd_ad1816a *chip, int device, + struct snd_timer **rtimer); #endif /* __SOUND_AD1816A_H */ diff --git a/include/sound/wss.h b/include/sound/wss.h index fd01f22825cd..6d65f322f1d5 100644 --- a/include/sound/wss.h +++ b/include/sound/wss.h @@ -154,6 +154,7 @@ int snd_wss_create(struct snd_card *card, unsigned short hardware, unsigned short hwshare, struct snd_wss **rchip); +int snd_wss_free(struct snd_wss *chip); int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm); int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer); int snd_wss_mixer(struct snd_wss *chip); |