---

yaml --- r: 312065 b: refs/heads/master c: 69c7e37 h: refs/heads/master i: 312063: 3a21233 v: v3
git-mirror · Jul 18, 2012 · d2edc54 · d2edc54
1 parent 3c018ba
commit d2edc54
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: 69da52f7eabbb9808ccaf7098ae676429f924e7d
+refs/heads/master: 69c7e3772eaee5d2097725cdb79bc3ef867c0d9e
diff --git a/trunk/arch/arm/boot/dts/spear600.dtsi b/trunk/arch/arm/boot/dts/spear600.dtsi
@@ -181,6 +181,7 @@
 			timer@f0000000 {
 				compatible = "st,spear-timer";
 				reg = <0xf0000000 0x400>;
+				interrupt-parent = <&vic0>;
 				interrupts = <16>;
 			};
 		};