From 586653571103407211d0b66876856775c6d8cd29 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 26 Sep 2012 09:07:41 -0300 Subject: [PATCH] --- yaml --- r: 340007 b: refs/heads/master c: 9b49e170c0bafb7fe9f04ae41fa3efd6aa2c2f09 h: refs/heads/master i: 340005: 0ab332fb8c31b9486c24c7d7c80a1ff0b4b78bca 340003: 86b7c3f8ae4638f898dd00243c04618a10f5ec45 339999: dc06406d87c14122c571883d7c9a5c6d0c1bf2b0 v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/imx27-3ds.dts | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 572e3dca7ec3..a7fd16b0f2f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48b797adc02cdfc079930f2dfa3195b13ef7c0df +refs/heads/master: 9b49e170c0bafb7fe9f04ae41fa3efd6aa2c2f09 diff --git a/trunk/arch/arm/boot/dts/imx27-3ds.dts b/trunk/arch/arm/boot/dts/imx27-3ds.dts index 0a8978a40ece..b01c0d745fc5 100644 --- a/trunk/arch/arm/boot/dts/imx27-3ds.dts +++ b/trunk/arch/arm/boot/dts/imx27-3ds.dts @@ -23,10 +23,6 @@ soc { aipi@10000000 { /* aipi */ - wdog@10002000 { - status = "okay"; - }; - uart1: serial@1000a000 { fsl,uart-has-rtscts; status = "okay";