]> git.baikalelectronics.ru Git - kernel.git/commit
ASoC: Fix merge errors with flush_scheduled_work() removal
authorTakashi Iwai <tiwai@suse.de>
Mon, 13 Dec 2010 11:55:39 +0000 (12:55 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 13 Dec 2010 11:58:59 +0000 (12:58 +0100)
commite37ac2a2ccffbcd11c6ce3762a99dac62a8149d6
treee16a5a57e667eb9b3f442ac6dd4509a0c20b57d8
parent6478e1380aaf49a7777d279487555f5bedd45bab
ASoC: Fix merge errors with flush_scheduled_work() removal

delayed_work was moved to dapm in the commit
92ca9f57ff3d18aca26362ba20b8ecfee5177c7d
    ASoC: Decouple DAPM from CODECs

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8753.c