---

yaml --- r: 299793 b: refs/heads/master c: 6fff5a1 h: refs/heads/master i: 299791: 19c245d v: v3
git-mirror · Apr 24, 2012 · 84694cd · 84694cd
1 parent 13f9135
commit 84694cd
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: ffabec4ef7ad6ca9365d39f643b8a24c0fce04e7
+refs/heads/master: 6fff5a11fd07d7f918ac3737da4846558518c31d
diff --git a/trunk/arch/arm/mach-exynos/common.c b/trunk/arch/arm/mach-exynos/common.c
@@ -547,7 +547,9 @@ void __init exynos5_init_irq(void)
 {
 	int irq;
 
+#ifdef CONFIG_OF
 	of_irq_init(exynos4_dt_irq_match);
+#endif
 
 	for (irq = 0; irq < EXYNOS5_MAX_COMBINER_NR; irq++) {
 		combiner_init(irq, (void __iomem *)S5P_VA_COMBINER(irq),