---

yaml --- r: 349127 b: refs/heads/master c: 36224d0 h: refs/heads/master i: 349125: a7e15f0 349123: e1e02fa 349119: 4d54a36 v: v3
git-mirror · Jan 23, 2013 · 8b36d83 · 8b36d83
1 parent 68a2cf9
commit 8b36d83
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 334c9e8d6d05be132792a855dcc637773d44cad3
+refs/heads/master: 36224d0fe0f34cdde66a381708853ebadeac799c
diff --git a/trunk/arch/arm/mach-at91/setup.c b/trunk/arch/arm/mach-at91/setup.c
@@ -105,6 +105,8 @@ static void __init soc_detect(u32 dbgu_base)
 	switch (socid) {
 	case ARCH_ID_AT91RM9200:
 		at91_soc_initdata.type = AT91_SOC_RM9200;
+		if (at91_soc_initdata.subtype == AT91_SOC_SUBTYPE_NONE)
+			at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA;
 		at91_boot_soc = at91rm9200_soc;
 		break;