Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-2.6-microblaze.git] / arch / arm / boot / dts / imx31.dtsi

diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi
index 45333f7..948d2a5 100644 (file)
--- a/arch/arm/boot/dts/imx31.dtsi
+++ b/arch/arm/boot/dts/imx31.dtsi
@@ -315,10 +315,11 @@
                                clock-names = "ref", "ipg";
                        };
 
-                       wdog: wdog@53fdc000 {
+                       wdog: watchdog@53fdc000 {
                                compatible = "fsl,imx31-wdt", "fsl,imx21-wdt";
                                reg = <0x53fdc000 0x4000>;
                                clocks = <&clks 41>;
+                               interrupts = <55>;
                        };
 
                        pwm: pwm@53fe0000 {