summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-05 19:54:46 +0200
committerMark Brown <broonie@kernel.org>2015-06-05 19:54:46 +0200
commitf3b368d3b9a22bb1ddc80808a64ecb7559791e87 (patch)
treeffe7f0c236b24d441fd779a839f7a1224e6be8e6 /include/sound
parentMerge remote-tracking branch 'asoc/topic/dma' into asoc-next (diff)
parentASoC: rt5645: fix kernel hang when call rt5645_set_jack_detect() (diff)
downloadlinux-f3b368d3b9a22bb1ddc80808a64ecb7559791e87.tar.xz
linux-f3b368d3b9a22bb1ddc80808a64ecb7559791e87.zip
Merge remote-tracking branch 'asoc/topic/rt5645' into asoc-next
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 120d9610054e..652cb9e4afe5 100644
--- a/include/sound/rt5645.h
+++ b/include/sound/rt5645.h
@@ -15,7 +15,6 @@ struct rt5645_platform_data {
/* IN2 can optionally be differential */
bool in2_diff;
- bool dmic_en;
unsigned int dmic1_data_pin;
/* 0 = IN2N; 1 = GPIO5; 2 = GPIO11 */
unsigned int dmic2_data_pin;
@@ -24,8 +23,6 @@ struct rt5645_platform_data {
unsigned int hp_det_gpio;
bool gpio_hp_det_active_high;
- /* true if codec's jd function is used */
- bool en_jd_func;
unsigned int jd_mode;
};