aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/watchdog/omap_wdt.c
diff options
context:
space:
mode:
authorAndrew Victor <andrew@sanpeople.com>2006-12-04 15:56:18 +0200
committerWim Van Sebroeck <wim@iguana.be>2006-12-07 22:46:50 +0100
commite0b79e0bc261ad320f6c218ac6823f7ca859171f (patch)
treeaf0aaf30edbe6d42217baa242c6d7aba8bbb406e /drivers/char/watchdog/omap_wdt.c
parent74e86ab884fb491c208905bdc32a9d95740be583 (diff)
downloadkernel_samsung_smdk4412-e0b79e0bc261ad320f6c218ac6823f7ca859171f.zip
kernel_samsung_smdk4412-e0b79e0bc261ad320f6c218ac6823f7ca859171f.tar.gz
kernel_samsung_smdk4412-e0b79e0bc261ad320f6c218ac6823f7ca859171f.tar.bz2
[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/omap_wdt.c')
-rw-r--r--drivers/char/watchdog/omap_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/omap_wdt.c b/drivers/char/watchdog/omap_wdt.c
index 5dbd7dc..6c6f973 100644
--- a/drivers/char/watchdog/omap_wdt.c
+++ b/drivers/char/watchdog/omap_wdt.c
@@ -290,7 +290,7 @@ static int __init omap_wdt_probe(struct platform_device *pdev)
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;