diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-01 17:58:10 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-01 17:58:10 +0300 |
commit | 75639e7ee1401b3876c7a00ffe96ea8027668690 (patch) | |
tree | 3d6813cd3fe0d974e0a40237d003a22c5f7438dd /sound/drivers/pcsp/pcsp.h | |
parent | 7584af10cf46e0f4aa1696f1be79fa0f19a945ba (diff) | |
parent | ad1cd745060ae2f24026b3b3d09da3426df6ab36 (diff) | |
download | linux-75639e7ee1401b3876c7a00ffe96ea8027668690.tar.xz |
Merge branch 'topic/beep-rename' into topic/core-change
Diffstat (limited to 'sound/drivers/pcsp/pcsp.h')
-rw-r--r-- | sound/drivers/pcsp/pcsp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/pcsp/pcsp.h b/sound/drivers/pcsp/pcsp.h index 174dd2ff0f22..1e123077923d 100644 --- a/sound/drivers/pcsp/pcsp.h +++ b/sound/drivers/pcsp/pcsp.h @@ -83,6 +83,6 @@ extern enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle); extern void pcsp_sync_stop(struct snd_pcsp *chip); extern int snd_pcsp_new_pcm(struct snd_pcsp *chip); -extern int snd_pcsp_new_mixer(struct snd_pcsp *chip); +extern int snd_pcsp_new_mixer(struct snd_pcsp *chip, int nopcm); #endif |