Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable

1 files changed, 15 insertions, 0 deletions

diff --git a/arch/arm/mach-mx25/devices.c b/arch/arm/mach-mx25/devices.c
index 3f4b8a0b5fac..3a405fa400eb 100644
--- a/arch/arm/mach-mx25/devices.c
+++ b/arch/arm/mach-mx25/devices.c
@@ -500,3 +500,18 @@ struct platform_device mx25_fb_device = {
                 .coherent_dma_mask = 0xFFFFFFFF,
         },
 };
+
+static struct resource mxc_wdt_resources[] = {
+        {
+                .start = MX25_WDOG_BASE_ADDR,
+                .end = MX25_WDOG_BASE_ADDR + SZ_16K - 1,
+                .flags = IORESOURCE_MEM,
+        },
+};
+
+struct platform_device mxc_wdt = {
+        .name = "imx2-wdt",
+        .id = 0,
+        .num_resources = ARRAY_SIZE(mxc_wdt_resources),
+        .resource = mxc_wdt_resources,
+};