summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2014-01-16 13:59:44 -0800
committerKevin Hilman <khilman@linaro.org>2014-01-16 13:59:52 -0800
commitcd2f43a1f7400a74a084094502f70df2e169c6e8 (patch)
tree5c1d96e485f494c09b1b60c14e8c2d88e00cee33 /drivers/watchdog
parent64576e439709738c0f55ab60cdba0ad18d5aa24e (diff)
parent843748123d95ae77a489b41f2f193e8502fc7ea8 (diff)
downloadop-kernel-dev-cd2f43a1f7400a74a084094502f70df2e169c6e8.zip
op-kernel-dev-cd2f43a1f7400a74a084094502f70df2e169c6e8.tar.gz
Merge tag 'davinci-for-v3.14/watchdog' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/drivers
From Sekhar Nori: This patch updates the davinci watchdog platform device name from generic "watchdog" to something more specific. * tag 'davinci-for-v3.14/watchdog' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: watchdog: davinci: rename platform driver to davinci-wdt Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/davinci_wdt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index dd625cc..12591f6 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -247,7 +247,7 @@ MODULE_DEVICE_TABLE(of, davinci_wdt_of_match);
static struct platform_driver platform_wdt_driver = {
.driver = {
- .name = "watchdog",
+ .name = "davinci-wdt",
.owner = THIS_MODULE,
.of_match_table = davinci_wdt_of_match,
},
@@ -267,4 +267,4 @@ MODULE_PARM_DESC(heartbeat,
__MODULE_STRING(DEFAULT_HEARTBEAT));
MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:watchdog");
+MODULE_ALIAS("platform:davinci-wdt");
OpenPOWER on IntegriCloud