diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:59 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:59 -0400 |
| commit | a3c6048dcfe3d7015e591b81c547b6df707b0859 (patch) | |
| tree | 88262502d8c2d4886887380818291629fdc53c0b /include/sound/wss.h | |
| parent | 87cd9d7c8501e5da79de542340208b5f6ab4e1a4 (diff) | |
| parent | cda9043d56cee9fea39e4ee33fd605ae477a1950 (diff) | |
Merge branch 'topic/cs423x-merge' into for-linus
Diffstat (limited to 'include/sound/wss.h')
| -rw-r--r-- | include/sound/wss.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/wss.h b/include/sound/wss.h index fd01f22825c..6d65f322f1d 100644 --- a/include/sound/wss.h +++ b/include/sound/wss.h | |||
| @@ -154,6 +154,7 @@ int snd_wss_create(struct snd_card *card, | |||
| 154 | unsigned short hardware, | 154 | unsigned short hardware, |
| 155 | unsigned short hwshare, | 155 | unsigned short hwshare, |
| 156 | struct snd_wss **rchip); | 156 | struct snd_wss **rchip); |
| 157 | int snd_wss_free(struct snd_wss *chip); | ||
| 157 | int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm); | 158 | int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm); |
| 158 | int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer); | 159 | int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer); |
| 159 | int snd_wss_mixer(struct snd_wss *chip); | 160 | int snd_wss_mixer(struct snd_wss *chip); |