3 files changed, 13 insertions, 6 deletions

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 46e258c533cc..53d75719078e 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1117,10 +1117,10 @@ config BOOKE_WDT
 config BOOKE_WDT_DEFAULT_TIMEOUT
         int "PowerPC Book-E Watchdog Timer Default Timeout"
         depends on BOOKE_WDT
-        default 38 if FSL_BOOKE
-        range 0 63 if FSL_BOOKE
-        default 3 if !FSL_BOOKE
-        range 0 3 if !FSL_BOOKE
+        default 38 if PPC_FSL_BOOK3E
+        range 0 63 if PPC_FSL_BOOK3E
+        default 3 if !PPC_FSL_BOOK3E
+        range 0 3 if !PPC_FSL_BOOK3E
         help
           Select the default watchdog timer period to be used by the PowerPC
           Book-E watchdog driver.  A watchdog "event" occurs when the bit
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
index ce0ab4415eff..3fe82d0e8caa 100644
--- a/drivers/watchdog/booke_wdt.c
+++ b/drivers/watchdog/booke_wdt.c
@@ -37,7 +37,7 @@
 u32 booke_wdt_enabled;
 u32 booke_wdt_period = CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT;
 
-#ifdef  CONFIG_FSL_BOOKE
+#ifdef  CONFIG_PPC_FSL_BOOK3E
 #define WDTP(x)         ((((x)&0x3)<<30)|(((x)&0x3c)<<15))
 #define WDTP_MASK       (WDTP(0x3f))
 #else
@@ -190,7 +190,7 @@ static long booke_wdt_ioctl(struct file *file,
         case WDIOC_SETTIMEOUT:
                 if (get_user(tmp, p))
                         return -EFAULT;
-#ifdef  CONFIG_FSL_BOOKE
+#ifdef  CONFIG_PPC_FSL_BOOK3E
                 /* period of 1 gives the largest possible timeout */
                 if (tmp > period_to_sec(1))
                         return -EINVAL;
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 27ab8db67d14..fceec4f4eb7e 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -413,6 +413,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),
@@ -422,6 +428,7 @@ static struct platform_driver omap_wdt_driver = {
         .driver         = {
                 .owner  = THIS_MODULE,
                 .name   = "omap_wdt",
+                .of_match_table = omap_wdt_of_match,
         },
 };