diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 10:22:37 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 10:22:37 -0500 |
| commit | 57648cd52b1848c6885bdbd948d113d52f3ddd43 (patch) | |
| tree | 218c74fde12577ea22f51eabcf4e8b65273edb54 /include/sound/wss.h | |
| parent | 79598324838a25cc378ecbb8c29dd1e3d3951d35 (diff) | |
| parent | fb716c0b7bed36064cd41d800c8f339f41adf084 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'include/sound/wss.h')
| -rw-r--r-- | include/sound/wss.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sound/wss.h b/include/sound/wss.h index 6d65f322f1d5..fd01f22825cd 100644 --- a/include/sound/wss.h +++ b/include/sound/wss.h | |||
| @@ -154,7 +154,6 @@ 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); | ||
| 158 | int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm); | 157 | int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm); |
| 159 | int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer); | 158 | int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer); |
| 160 | int snd_wss_mixer(struct snd_wss *chip); | 159 | int snd_wss_mixer(struct snd_wss *chip); |