| commit | fdea0571ddca8e3f22448f66d72a034575abea28 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Mon Dec 13 12:55:39 2010 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Mon Dec 13 12:58:59 2010 +0100 |
| tree | e16a5a57e667eb9b3f442ac6dd4509a0c20b57d8 | |
| parent | 20aeeb356ba2e8daa99b5942c528ae2b3ea28433 [diff] |
ASoC: Fix merge errors with flush_scheduled_work() removal
delayed_work was moved to dapm in the commit
ce6120cca2589ede530200c7cfe11ac9f144333c
ASoC: Decouple DAPM from CODECs
Signed-off-by: Takashi Iwai <tiwai@suse.de>