diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-22 13:19:39 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-22 13:19:39 +0300 |
| commit | 25305dcf5de52fe48437c46dd4d15d1e87b9fbee (patch) | |
| tree | 0201293c916547972907924a7e178f25319099c2 /include | |
| parent | 89fc594ba54f0fbcc021da0c2d6916f26679bb17 (diff) | |
| parent | c99d49a8f81fb35e67b0ffa45f320a75e0b5639d (diff) | |
| download | linux-25305dcf5de52fe48437c46dd4d15d1e87b9fbee.tar.xz | |
Merge tag 'asoc-v4.2-2' into asoc-next
ASoC: Further updates for v4.2
There's a bunch of additional updates and fixes that came in since my
orignal pull request here, including DT support for rt5645 and fairly
large serieses of cleanups and improvements to tas2552 and rcar.
# gpg: Signature made Mon 22 Jun 2015 10:24:48 BST using RSA key ID 5D5487D0
# gpg: Oops: keyid_from_fingerprint: no pubkey
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
# gpg: aka "Mark Brown <broonie@debian.org>"
# gpg: aka "Mark Brown <broonie@kernel.org>"
# gpg: aka "Mark Brown <broonie@tardis.ed.ac.uk>"
# gpg: aka "Mark Brown <broonie@linaro.org>"
# gpg: aka "Mark Brown <Mark.Brown@linaro.org>"
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/rt5645.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/sound/rt5645.h b/include/sound/rt5645.h index 652cb9e4afe5..22734bc3ffd4 100644 --- a/include/sound/rt5645.h +++ b/include/sound/rt5645.h @@ -20,9 +20,6 @@ struct rt5645_platform_data { unsigned int dmic2_data_pin; /* 0 = IN2P; 1 = GPIO6; 2 = GPIO10; 3 = GPIO12 */ - unsigned int hp_det_gpio; - bool gpio_hp_det_active_high; - unsigned int jd_mode; }; |