diff options
Diffstat (limited to 'include/sound/soc.h')
| -rw-r--r-- | include/sound/soc.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 76bc944dcb5c..54be47a1a429 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
| @@ -450,8 +450,10 @@ int soc_dai_hw_params(struct snd_pcm_substream *substream, | |||
| 450 | struct snd_soc_dai *dai); | 450 | struct snd_soc_dai *dai); |
| 451 | 451 | ||
| 452 | /* Jack reporting */ | 452 | /* Jack reporting */ |
| 453 | int snd_soc_jack_new(struct snd_soc_codec *codec, const char *id, int type, | 453 | int snd_soc_card_jack_new(struct snd_soc_card *card, const char *id, int type, |
| 454 | struct snd_soc_jack *jack); | 454 | struct snd_soc_jack *jack, struct snd_soc_jack_pin *pins, |
| 455 | unsigned int num_pins); | ||
| 456 | |||
| 455 | void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask); | 457 | void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask); |
| 456 | int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count, | 458 | int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count, |
| 457 | struct snd_soc_jack_pin *pins); | 459 | struct snd_soc_jack_pin *pins); |
| @@ -659,7 +661,7 @@ struct snd_soc_jack_gpio { | |||
| 659 | struct snd_soc_jack { | 661 | struct snd_soc_jack { |
| 660 | struct mutex mutex; | 662 | struct mutex mutex; |
| 661 | struct snd_jack *jack; | 663 | struct snd_jack *jack; |
| 662 | struct snd_soc_codec *codec; | 664 | struct snd_soc_card *card; |
| 663 | struct list_head pins; | 665 | struct list_head pins; |
| 664 | int status; | 666 | int status; |
| 665 | struct blocking_notifier_head notifier; | 667 | struct blocking_notifier_head notifier; |
