From e153a71000aa76ff9a8b189321eebf481f0a328c Mon Sep 17 00:00:00 2001 From: Pawel Moll Date: Wed, 4 Jul 2012 13:40:40 +0100 Subject: [PATCH] --- yaml --- r: 313193 b: refs/heads/master c: b7541a950f27fc9237ce1fcb5c2284ee5c71efe3 h: refs/heads/master i: 313191: a7d51e61c07ad07e9d8333f64ae03c8fadf13708 v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 1 + trunk/arch/arm/boot/dts/vexpress-v2m.dtsi | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 60268f24e287..7ef16c3ceaae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1b8a775fdb686c949d31e366a898b64147543e0 +refs/heads/master: b7541a950f27fc9237ce1fcb5c2284ee5c71efe3 diff --git a/trunk/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi b/trunk/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi index 16076e2d0934..142c72a938d3 100644 --- a/trunk/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi +++ b/trunk/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi @@ -157,6 +157,7 @@ v2m_timer23: timer@120000 { compatible = "arm,sp804", "arm,primecell"; reg = <0x120000 0x1000>; + interrupts = <3>; }; /* DVI I2C bus */ diff --git a/trunk/arch/arm/boot/dts/vexpress-v2m.dtsi b/trunk/arch/arm/boot/dts/vexpress-v2m.dtsi index a6c9c7c82d53..47ee30791f44 100644 --- a/trunk/arch/arm/boot/dts/vexpress-v2m.dtsi +++ b/trunk/arch/arm/boot/dts/vexpress-v2m.dtsi @@ -156,6 +156,7 @@ v2m_timer23: timer@12000 { compatible = "arm,sp804", "arm,primecell"; reg = <0x12000 0x1000>; + interrupts = <3>; }; /* DVI I2C bus */