ASoC: Fix merge with PXA tree

Browse source

Fix a merge issue caused by context overlap.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

...

This commit is contained in:

Mark Brown 2009-01-23 11:23:32 +00:00

parent ff637d38ea

commit c91cf25ebf

1 changed files with 1 additions and 4 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

5

sound/soc/pxa/e800_wm9712.c

View file