From: David Brownell <david-b@pacbell.net>

Recent driver model changes affected "miscdev" and broke
the build for the OMAP watchdog timer; fixed by this patch.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/char/watchdog/omap_wdt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/char/watchdog/omap_wdt.c~watchdog-omap_wdt-build-fix drivers/char/watchdog/omap_wdt.c
--- a/drivers/char/watchdog/omap_wdt.c~watchdog-omap_wdt-build-fix
+++ a/drivers/char/watchdog/omap_wdt.c
@@ -290,7 +290,7 @@ static int __init omap_wdt_probe(struct 
 	omap_wdt_disable();
 	omap_wdt_adjust_timeout(timer_margin);
 
-	omap_wdt_miscdev.dev = &pdev->dev;
+	omap_wdt_miscdev.parent = &pdev->dev;
 	ret = misc_register(&omap_wdt_miscdev);
 	if (ret)
 		goto fail;
_