diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-07 03:54:33 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-07 03:54:33 -0400 |
| commit | 1172234cbe94658c16bc83e50ca57b5a47085209 (patch) | |
| tree | 15bddd783be48899167a9cd764d3f23cfd05572e /include | |
| parent | 85255c0e078158ede61ff8bd296e306db6f7ed19 (diff) | |
| parent | b0cc58a25d04160d39a80e436847eaa2fbc5aa09 (diff) | |
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/ak4113.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/ak4113.h b/include/sound/ak4113.h index 8988edae1609..2609048c1d44 100644 --- a/include/sound/ak4113.h +++ b/include/sound/ak4113.h | |||
| @@ -307,7 +307,7 @@ struct ak4113 { | |||
| 307 | 307 | ||
| 308 | int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read, | 308 | int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read, |
| 309 | ak4113_write_t *write, | 309 | ak4113_write_t *write, |
| 310 | const unsigned char pgm[AK4113_WRITABLE_REGS], | 310 | const unsigned char *pgm, |
| 311 | void *private_data, struct ak4113 **r_ak4113); | 311 | void *private_data, struct ak4113 **r_ak4113); |
| 312 | void snd_ak4113_reg_write(struct ak4113 *ak4113, unsigned char reg, | 312 | void snd_ak4113_reg_write(struct ak4113 *ak4113, unsigned char reg, |
| 313 | unsigned char mask, unsigned char val); | 313 | unsigned char mask, unsigned char val); |