diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-05-01 08:47:44 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-05-01 08:47:44 -0700 |
| commit | bf61c8840efe60fd8f91446860b63338fb424158 (patch) | |
| tree | 7a71832407a4f0d6346db773343f4c3ae2257b19 /drivers/watchdog/ep93xx_wdt.c | |
| parent | 5846115b30f3a881e542c8bfde59a699c1c13740 (diff) | |
| parent | 0c6a61657da78098472fd0eb71cc01f2387fa1bb (diff) | |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.10 merge window.
Diffstat (limited to 'drivers/watchdog/ep93xx_wdt.c')
| -rw-r--r-- | drivers/watchdog/ep93xx_wdt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c index 77050037597a..e0574844c313 100644 --- a/drivers/watchdog/ep93xx_wdt.c +++ b/drivers/watchdog/ep93xx_wdt.c @@ -112,7 +112,7 @@ static struct watchdog_device ep93xx_wdt_wdd = { .ops = &ep93xx_wdt_ops, }; -static int __devinit ep93xx_wdt_probe(struct platform_device *pdev) +static int ep93xx_wdt_probe(struct platform_device *pdev) { struct resource *res; unsigned long val; @@ -156,7 +156,7 @@ static int __devinit ep93xx_wdt_probe(struct platform_device *pdev) return 0; } -static int __devexit ep93xx_wdt_remove(struct platform_device *pdev) +static int ep93xx_wdt_remove(struct platform_device *pdev) { watchdog_unregister_device(&ep93xx_wdt_wdd); return 0; @@ -168,7 +168,7 @@ static struct platform_driver ep93xx_wdt_driver = { .name = "ep93xx-wdt", }, .probe = ep93xx_wdt_probe, - .remove = __devexit_p(ep93xx_wdt_remove), + .remove = ep93xx_wdt_remove, }; module_platform_driver(ep93xx_wdt_driver); |