summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai2015-06-22 11:32:41 +0200
committerTakashi Iwai2015-06-22 11:32:41 +0200
commit57fa8a1e22c5833fb2cae96af68fc39ec21cb017 (patch)
treeb0bb4e4a6e04a24119da30253add9fe9ffbc8d22 /include/sound
parentALSA: hda-beep: Update authors dead email address (diff)
parentMerge remote-tracking branch 'asoc/topic/wm8995' into asoc-next (diff)
downloadkernel-qcow2-linux-57fa8a1e22c5833fb2cae96af68fc39ec21cb017.tar.gz
kernel-qcow2-linux-57fa8a1e22c5833fb2cae96af68fc39ec21cb017.tar.xz
kernel-qcow2-linux-57fa8a1e22c5833fb2cae96af68fc39ec21cb017.zip
Merge tag 'asoc-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-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.
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/rt5645.h3
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;
};