diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2006-12-12 23:48:41 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2006-12-12 23:48:41 +0100 |
| commit | a57bf8a4f23cca2b5be5446649bbe22d1440af5d (patch) | |
| tree | d568ec3dec15e4169e8058c321454afdb96d2791 /drivers/char/watchdog/mpcore_wdt.c | |
| parent | d4b87598e940053fa22020dcdc6384827b4fc58d (diff) | |
| parent | e0b79e0bc261ad320f6c218ac6823f7ca859171f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
Diffstat (limited to 'drivers/char/watchdog/mpcore_wdt.c')
| -rw-r--r-- | drivers/char/watchdog/mpcore_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/char/watchdog/mpcore_wdt.c index 3404a9c67f0..e88947f8fe5 100644 --- a/drivers/char/watchdog/mpcore_wdt.c +++ b/drivers/char/watchdog/mpcore_wdt.c @@ -347,7 +347,7 @@ static int __devinit mpcore_wdt_probe(struct platform_device *dev) goto err_free; } - mpcore_wdt_miscdev.dev = &dev->dev; + mpcore_wdt_miscdev.parent = &dev->dev; ret = misc_register(&mpcore_wdt_miscdev); if (ret) { dev_printk(KERN_ERR, _dev, "cannot register miscdev on minor=%d (err=%d)\n", |