diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2006-12-12 22:48:41 (GMT) |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2006-12-12 22:48:41 (GMT) |
| commit | a57bf8a4f23cca2b5be5446649bbe22d1440af5d (patch) | |
| tree | d568ec3dec15e4169e8058c321454afdb96d2791 /drivers/char/watchdog/at91rm9200_wdt.c | |
| parent | d4b87598e940053fa22020dcdc6384827b4fc58d (diff) | |
| parent | e0b79e0bc261ad320f6c218ac6823f7ca859171f (diff) | |
| download | linux-a57bf8a4f23cca2b5be5446649bbe22d1440af5d.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
Diffstat (limited to 'drivers/char/watchdog/at91rm9200_wdt.c')
| -rw-r--r-- | drivers/char/watchdog/at91rm9200_wdt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/watchdog/at91rm9200_wdt.c b/drivers/char/watchdog/at91rm9200_wdt.c index cb86967..38bd373 100644 --- a/drivers/char/watchdog/at91rm9200_wdt.c +++ b/drivers/char/watchdog/at91rm9200_wdt.c @@ -203,9 +203,9 @@ static int __init at91wdt_probe(struct platform_device *pdev) { 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 platform_device *pdev) res = misc_deregister(&at91wdt_miscdev); if (!res) - at91wdt_miscdev.dev = NULL; + at91wdt_miscdev.parent = NULL; return res; } |