Merge 3.14-rc4 into char-misc-linus

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / watchdog / davinci_wdt.c

diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index dbe2834..b1bae03 100644 (file)
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -143,7 +143,7 @@ static unsigned int davinci_wdt_get_timeleft(struct watchdog_device *wdd)
 
 static const struct watchdog_info davinci_wdt_info = {
        .options = WDIOF_KEEPALIVEPING,
-       .identity = "DaVinci Watchdog",
+       .identity = "DaVinci/Keystone Watchdog",
 };
 
 static const struct watchdog_ops davinci_wdt_ops = {