From dbdc62757a2ced3cd7d37001c3adce503ade8423 Mon Sep 17 00:00:00 2001
From: Xiao Jiang <jgq516@gmail.com>
Date: Fri, 1 Jun 2012 12:44:16 +0800
Subject: [PATCH] --- yaml --- r: 313273 b: refs/heads/master c:
 e6ca04eaabbd5599b79c54db9a4dd8e9bfb424ec h: refs/heads/master i:   313271:
 3c54502af02967918205b508d5cad02e26b2f9f6 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/watchdog/omap_wdt.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a99388f460df..8118448308fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e152231995aa4ed5eafd87a6a8348563248f843
+refs/heads/master: e6ca04eaabbd5599b79c54db9a4dd8e9bfb424ec
diff --git a/trunk/drivers/watchdog/omap_wdt.c b/trunk/drivers/watchdog/omap_wdt.c
index 8285d65cd207..02ebfd5f0e65 100644
--- a/trunk/drivers/watchdog/omap_wdt.c
+++ b/trunk/drivers/watchdog/omap_wdt.c
@@ -430,6 +430,12 @@ static int omap_wdt_resume(struct platform_device *pdev)
 #define	omap_wdt_resume		NULL
 #endif
 
+static const struct of_device_id omap_wdt_of_match[] = {
+	{ .compatible = "ti,omap3-wdt", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, omap_wdt_of_match);
+
 static struct platform_driver omap_wdt_driver = {
 	.probe		= omap_wdt_probe,
 	.remove		= __devexit_p(omap_wdt_remove),
@@ -439,6 +445,7 @@ static struct platform_driver omap_wdt_driver = {
 	.driver		= {
 		.owner	= THIS_MODULE,
 		.name	= "omap_wdt",
+		.of_match_table = omap_wdt_of_match,
 	},
 };