Merge commit 'v3.3' into fbdev-next

2012-03-20 18:59:50 +00:00
parent e9fe8a714e c16fa4f2ad
commit 44e8ba93cf
319 changed files with 3366 additions and 3628 deletions
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -801,7 +801,7 @@ static struct fsi_ak4642_info fsi2_ak4643_info = {
 static struct platform_device fsi_ak4643_device = {
 	.name	= "fsi-ak4642-audio",
 	.dev	= {
-		.platform_data	= &fsi_info,
+		.platform_data	= &fsi2_ak4643_info,
 	},
 };