diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-20 09:59:29 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-20 09:59:29 (GMT) |
| commit | 5e8aa85253513b9c1ade8bd71dc341218a752a65 (patch) | |
| tree | 84240b7f72fefb805c78300de0ae23b7b96bf5c2 /include/sound/es1688.h | |
| parent | 7bd9db83087aecef8279c0b8b9dfef4db4a8fc3c (diff) | |
| parent | 550a8b691ca67761bbf382d98fbd81d215f1d7f0 (diff) | |
| download | linux-5e8aa85253513b9c1ade8bd71dc341218a752a65.tar.xz | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'include/sound/es1688.h')
| -rw-r--r-- | include/sound/es1688.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/sound/es1688.h b/include/sound/es1688.h index 10fcf14..3ec7ecb 100644 --- a/include/sound/es1688.h +++ b/include/sound/es1688.h @@ -44,7 +44,6 @@ struct snd_es1688 { unsigned char pad; unsigned int dma_size; - struct snd_card *card; struct snd_pcm *pcm; struct snd_pcm_substream *playback_substream; struct snd_pcm_substream *capture_substream; @@ -108,14 +107,16 @@ struct snd_es1688 { void snd_es1688_mixer_write(struct snd_es1688 *chip, unsigned char reg, unsigned char data); int snd_es1688_create(struct snd_card *card, + struct snd_es1688 *chip, unsigned long port, unsigned long mpu_port, int irq, int mpu_irq, int dma8, - unsigned short hardware, - struct snd_es1688 ** rchip); -int snd_es1688_pcm(struct snd_es1688 *chip, int device, struct snd_pcm ** rpcm); -int snd_es1688_mixer(struct snd_es1688 *chip); + unsigned short hardware); +int snd_es1688_pcm(struct snd_card *card, struct snd_es1688 *chip, int device, + struct snd_pcm **rpcm); +int snd_es1688_mixer(struct snd_card *card, struct snd_es1688 *chip); +int snd_es1688_reset(struct snd_es1688 *chip); #endif /* __SOUND_ES1688_H */ |