diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-11-26 08:12:42 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-11-26 08:12:42 -0500 |
| commit | e7dd8c1bdacf658b0ade51facb2f7eaf40eb0ac4 (patch) | |
| tree | 0db15820fdd391a1570e1257167e8f02532c83f5 /sound/drivers/pcsp/pcsp.h | |
| parent | ed313489badef16d700f5a3be50e8fd8f8294bc8 (diff) | |
| parent | bc4a68fed4b4c01005ef3c71ede6a8cbe91b7dc9 (diff) | |
Merge branch 'topic/misc' into topic/pcsp-fix
Conflicts:
sound/drivers/pcsp/pcsp_lib.c
Diffstat (limited to 'sound/drivers/pcsp/pcsp.h')
| -rw-r--r-- | sound/drivers/pcsp/pcsp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/drivers/pcsp/pcsp.h b/sound/drivers/pcsp/pcsp.h index 1d661f795e8c..70533a333b5b 100644 --- a/sound/drivers/pcsp/pcsp.h +++ b/sound/drivers/pcsp/pcsp.h | |||
| @@ -77,6 +77,7 @@ struct snd_pcsp { | |||
| 77 | extern struct snd_pcsp pcsp_chip; | 77 | extern struct snd_pcsp pcsp_chip; |
| 78 | 78 | ||
| 79 | extern enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle); | 79 | extern enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle); |
| 80 | extern void pcsp_sync_stop(struct snd_pcsp *chip); | ||
| 80 | 81 | ||
| 81 | extern int snd_pcsp_new_pcm(struct snd_pcsp *chip); | 82 | extern int snd_pcsp_new_pcm(struct snd_pcsp *chip); |
| 82 | extern int snd_pcsp_new_mixer(struct snd_pcsp *chip); | 83 | extern int snd_pcsp_new_mixer(struct snd_pcsp *chip); |