aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/watchdog/at91rm9200_wdt.c
diff options
context:
space:
mode:
authorAndrew Victor <andrew@sanpeople.com>2006-12-04 08:56:18 -0500
committerWim Van Sebroeck <wim@iguana.be>2006-12-07 16:46:50 -0500
commite0b79e0bc261ad320f6c218ac6823f7ca859171f (patch)
treeaf0aaf30edbe6d42217baa242c6d7aba8bbb406e /drivers/char/watchdog/at91rm9200_wdt.c
parent74e86ab884fb491c208905bdc32a9d95740be583 (diff)
[WATCHDOG] watchdog miscdevice patch
It looks like the recent changes to 'struct miscdevice' have impacted some of the Watchdog drivers. at91rm9200_wdt.c:205: error: 'struct miscdevice' has no member named 'dev' For the AT91RM9200 driver I just replaced "miscdevice.dev" with "miscdevice.parent". The mpcore_wdt.c and omap_wdt.c seem similarly affected. Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/char/watchdog/at91rm9200_wdt.c')
-rw-r--r--drivers/char/watchdog/at91rm9200_wdt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/watchdog/at91rm9200_wdt.c b/drivers/char/watchdog/at91rm9200_wdt.c
index 4e7a1145e78f..c8da2b0a1cd8 100644
--- a/drivers/char/watchdog/at91rm9200_wdt.c
+++ b/drivers/char/watchdog/at91rm9200_wdt.c
@@ -202,9 +202,9 @@ static int __init at91wdt_probe(struct platform_device *pdev)
202{ 202{
203 int res; 203 int res;
204 204
205 if (at91wdt_miscdev.dev) 205 if (at91wdt_miscdev.parent)
206 return -EBUSY; 206 return -EBUSY;
207 at91wdt_miscdev.dev = &pdev->dev; 207 at91wdt_miscdev.parent = &pdev->dev;
208 208
209 res = misc_register(&at91wdt_miscdev); 209 res = misc_register(&at91wdt_miscdev);
210 if (res) 210 if (res)
@@ -220,7 +220,7 @@ static int __exit at91wdt_remove(struct platform_device *pdev)
220 220
221 res = misc_deregister(&at91wdt_miscdev); 221 res = misc_deregister(&at91wdt_miscdev);
222 if (!res) 222 if (!res)
223 at91wdt_miscdev.dev = NULL; 223 at91wdt_miscdev.parent = NULL;
224 224
225 return res; 225 return res;
226} 226}