[patch 2.6.19-git] watchdog: at91_wdt build fix

From: David Brownell
Date: Fri Dec 08 2006 - 02:27:50 EST


Recent miscdev changes broke various drivers, so they won't build.
This fixes another one.

Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>

Index: at91/drivers/char/watchdog/at91rm9200_wdt.c
===================================================================
--- at91.orig/drivers/char/watchdog/at91rm9200_wdt.c 2006-12-07 21:37:00.000000000 -0800
+++ at91/drivers/char/watchdog/at91rm9200_wdt.c 2006-12-07 21:38:28.000000000 -0800
@@ -203,9 +203,9 @@ static int __init at91wdt_probe(struct p
{
int res;

- if (at91wdt_miscdev.dev)
+ if (at91wdt_miscdev.parent)
return -EBUSY;
- at91wdt_miscdev.dev = &pdev->dev;
+ at91wdt_miscdev.parent = &pdev->dev;

res = misc_register(&at91wdt_miscdev);
if (res)
@@ -221,7 +221,7 @@ static int __exit at91wdt_remove(struct

res = misc_deregister(&at91wdt_miscdev);
if (!res)
- at91wdt_miscdev.dev = NULL;
+ at91wdt_miscdev.parent = NULL;

return res;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/