linux-next: manual merge of the sound-asoc tree with the s5p tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in
arch/arm/mach-s3c64xx/mach-crag6410.c between commit c5c32c965dad ("ARM:
S3C64XX: Hook up Littlemill audio card on Cragganmore") from the s5p tree
and commit 6414261f0a2a ("ASoC: Rename Speyside WM8962 to Tobermory")
from the sound-asoc tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
index 6ff76c0,55c0e75..0000000
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@@ -346,8 -338,7 +346,8 @@@ static struct platform_device *crag6410
  	&crag6410_lcd_powerdev,
  	&crag6410_backlight_device,
  	&speyside_device,
- 	&speyside_wm8962_device,
+ 	&tobermory_device,
 +	&littlemill_device,
  	&lowland_device,
  	&wallvdd_device,
  };

Attachment: pgp00000.pgp
Description: PGP signature