From ac3328d3c1b00f7d255373b1b40413360ae579d2 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 20 Nov 2009 13:07:57 +0000
Subject: [PATCH] --- yaml --- r: 168987 b: refs/heads/master c:
 1508c99506b5d57b8892a5d759176000c88c93b6 h: refs/heads/master i:   168985:
 1f26bb3930b8c7f1cda0a69a6fb507c15011cbd5   168983:
 ef94b0e074583d9adf92c6ba28be48a26f730158 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/watchdog/pnx4008_wdt.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 92e8a92ec09f..14ed08c45081 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ff1fa278b0bd1b2dd3c42efc0cb86788ffe05d5
+refs/heads/master: 1508c99506b5d57b8892a5d759176000c88c93b6
diff --git a/trunk/drivers/watchdog/pnx4008_wdt.c b/trunk/drivers/watchdog/pnx4008_wdt.c
index f24d04132eda..4d227b152001 100644
--- a/trunk/drivers/watchdog/pnx4008_wdt.c
+++ b/trunk/drivers/watchdog/pnx4008_wdt.c
@@ -317,7 +317,7 @@ static int __devexit pnx4008_wdt_remove(struct platform_device *pdev)
 
 static struct platform_driver platform_wdt_driver = {
 	.driver = {
-		.name = "watchdog",
+		.name = "pnx4008-watchdog",
 		.owner	= THIS_MODULE,
 	},
 	.probe = pnx4008_wdt_probe,
@@ -352,4 +352,4 @@ MODULE_PARM_DESC(nowayout,
 
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-MODULE_ALIAS("platform:watchdog");
+MODULE_ALIAS("platform:pnx4008-watchdog");