Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty...

[~andy/linux] / include / sound / wm8960.h

diff --git a/include/sound/wm8960.h b/include/sound/wm8960.h
index 74e9a95529c502de158e6dd04426548135ad4b60..e8ce8ee7d62d996c0be5cd7ecb93baabefc37a57 100644 (file)
--- a/include/sound/wm8960.h
+++ b/include/sound/wm8960.h
@@ -18,7 +18,7 @@
 struct wm8960_data {
        bool capless;  /* Headphone outputs configured in capless mode */
 
-       int dres;  /* Discharge resistance for headphone outputs */
+       bool shared_lrclk;  /* DAC and ADC LRCLKs are wired together */
 };
 
 #endif