ASoC: Fix merge errors with flush_scheduled_work() removal

Browse source

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

Signed-off-by: Takashi Iwai <tiwai@suse.de>

...

This commit is contained in:

Takashi Iwai 2010-12-13 12:55:39 +01:00

parent 20aeeb356b

commit fdea0571dd

2 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

sound/soc/codecs/wm8350.c

View file

2

sound/soc/codecs/wm8753.c

View file