---

yaml --- r: 270166 b: refs/heads/master c: 9c12845 h: refs/heads/master v: v3
git-mirror · Sep 23, 2011 · d8d96d2 · d8d96d2
1 parent 8066798
commit d8d96d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 746a9d1963f1c7a3cd22662065d7dcd3d93ee62e
+refs/heads/master: 9c12845ee49716209cb2b087c0b47c3e37096bde
diff --git a/trunk/arch/arm/common/gic.c b/trunk/arch/arm/common/gic.c
@@ -544,6 +544,7 @@ void __init gic_init(unsigned int gic_nr, unsigned int irq_start,
 	if (gic_nr == 0)
 		gic_cpu_base_addr = cpu_base;
 
+	gic_chip.flags |= gic_arch_extn.flags;
 	gic_dist_init(gic, irq_start);
 	gic_cpu_init(gic);
 	gic_pm_init(gic);