Merge branch 'topic/asoc' into for-linus

Conflicts: arch/powerpc/platforms/85xx/p1022_ds.c
2010-10-25 10:00:30 +02:00
parent 79fc84c7e0 b11bdb5254
commit aa5c14d5c0
380 changed files with 31740 additions and 16402 deletions
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -551,7 +551,7 @@ static struct resource siu_resources[] = {
 };

 static struct platform_device siu_device = {
-	.name		= "sh_siu",
+	.name		= "siu-pcm-audio",
 	.id		= -1,
 	.dev = {
 		.platform_data	= &siu_platform_data,