Merge remote-tracking branch 'asoc/topic/jack' into asoc-next

This commit is contained in:
Mark Brown 2014-03-13 14:19:32 +00:00
commit 4c11a761b8
2 changed files with 5 additions and 3 deletions

View file

@ -607,7 +607,8 @@ struct snd_soc_jack_gpio {
struct snd_soc_jack *jack;
struct delayed_work work;
int (*jack_status_check)(void);
void *data;
int (*jack_status_check)(void *data);
};
struct snd_soc_jack {