git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
[sfrench/cifs-2.6.git]
/
include
/
sound
/
soc-dapm.h
diff --git
a/include/sound/soc-dapm.h
b/include/sound/soc-dapm.h
index 44a30b1086835d1d1fcc2840bb5328d5a2ce19b2..d4609029f014e3dc9cd4592e6719bba470f4bb67 100644
(file)
--- a/
include/sound/soc-dapm.h
+++ b/
include/sound/soc-dapm.h
@@
-566,7
+566,6
@@
struct snd_soc_dapm_update {
/* DAPM context */
struct snd_soc_dapm_context {
- int n_widgets; /* number of widgets in this context */
enum snd_soc_bias_level bias_level;
enum snd_soc_bias_level suspend_bias_level;
struct delayed_work delayed_work;