diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 05:15:40 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 05:15:40 -0400 |
| commit | 5e34437840d33554f69380584311743b39e8fbeb (patch) | |
| tree | e081135619ee146af5efb9ee883afca950df5757 /include/sound/wss.h | |
| parent | 77d05632baee21b1cef8730d7c06aa69601e4dca (diff) | |
| parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) | |
Merge branch 'linus' into core/softlockup
Conflicts:
kernel/sysctl.c
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 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, | |||
| 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); |