diff --git a/[refs] b/[refs]
index 1c0de13bc680..3a6cac4057c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d49d53552b60be2caaa853c814662bc4e24428e
+refs/heads/master: 820f3dd7964f1889baaaaa0c2ba45d05bb619f66
diff --git a/trunk/arch/arm/mach-exynos/common.c b/trunk/arch/arm/mach-exynos/common.c
index 9900158f026a..49134711f4c6 100644
--- a/trunk/arch/arm/mach-exynos/common.c
+++ b/trunk/arch/arm/mach-exynos/common.c
@@ -568,7 +568,11 @@ void __init combiner_init(void __iomem *combiner_base, struct device_node *np)
 
 	for (i = 0; i < max_nr; i++) {
 		combiner_init_one(i, combiner_base + (i >> 2) * 0x10);
-		irq = np ? irq_of_parse_and_map(np, i) : IRQ_SPI(i);
+		irq = IRQ_SPI(i);
+#ifdef CONFIG_OF
+		if (np)
+			irq = irq_of_parse_and_map(np, i);
+#endif
 		combiner_cascade_irq(i, irq);
 	}
 }