---

yaml --- r: 347750 b: refs/heads/master c: 12fee19 h: refs/heads/master v: v3
git-mirror · Dec 19, 2012 · 99258dc · 99258dc
1 parent da7c903
commit 99258dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ade7ffbb9b6f2ab65e69496bc4076e215e2cd8ba
+refs/heads/master: 12fee1949e2b302009026ce28e4ef6fac721d7ea
diff --git a/trunk/arch/arm/mach-exynos/common.c b/trunk/arch/arm/mach-exynos/common.c
@@ -679,7 +679,8 @@ void __init exynos5_init_irq(void)
 	 * Theses parameters should be NULL and 0 because EXYNOS4
 	 * uses GIC instead of VIC.
 	 */
-	s5p_init_irq(NULL, 0);
+	if (!of_machine_is_compatible("samsung,exynos5440"))
+		s5p_init_irq(NULL, 0);
 
 	gic_arch_extn.irq_set_wake = s3c_irq_wake;
 }