From d8d96d23f2d28a89d7cd04d128b108c9b273d15a Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 13 Jun 2011 00:45:59 +0000
Subject: [PATCH] --- yaml --- r: 270166 b: refs/heads/master c:
 9c12845ee49716209cb2b087c0b47c3e37096bde h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/arm/common/gic.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0d07210eec5b..76c37253ee20 100644
--- 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
index 66c7c4820108..734db99eaee7 100644
--- 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);