Merge commit 'v3.1-rc1' into imx-fixes

2011-08-08 08:22:41 +02:00
parent e1b96ada65 322a8b0340
commit 1a43f20124
8231 changed files with 493426 additions and 378449 deletions
--- a/arch/arm/mach-imx/mach-mx31lilly.c
+++ b/arch/arm/mach-imx/mach-mx31lilly.c
@@ -243,6 +243,8 @@ core_param(mx31lilly_baseboard, mx31lilly_baseboard, int, 0444);

 static void __init mx31lilly_board_init(void)
 {
+	imx31_soc_init();
+
 	switch (mx31lilly_baseboard) {
 	case MX31LILLY_NOBOARD:
 		break;