diff options
Diffstat (limited to 'drivers/watchdog/mpc8xxx_wdt.c')
| -rw-r--r-- | drivers/watchdog/mpc8xxx_wdt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c index e6a038ae8dc2..da2752063bb7 100644 --- a/drivers/watchdog/mpc8xxx_wdt.c +++ b/drivers/watchdog/mpc8xxx_wdt.c | |||
| @@ -188,7 +188,7 @@ static struct miscdevice mpc8xxx_wdt_miscdev = { | |||
| 188 | }; | 188 | }; |
| 189 | 189 | ||
| 190 | static const struct of_device_id mpc8xxx_wdt_match[]; | 190 | static const struct of_device_id mpc8xxx_wdt_match[]; |
| 191 | static int __devinit mpc8xxx_wdt_probe(struct platform_device *ofdev) | 191 | static int mpc8xxx_wdt_probe(struct platform_device *ofdev) |
| 192 | { | 192 | { |
| 193 | int ret; | 193 | int ret; |
| 194 | const struct of_device_id *match; | 194 | const struct of_device_id *match; |
| @@ -245,7 +245,7 @@ err_unmap: | |||
| 245 | return ret; | 245 | return ret; |
| 246 | } | 246 | } |
| 247 | 247 | ||
| 248 | static int __devexit mpc8xxx_wdt_remove(struct platform_device *ofdev) | 248 | static int mpc8xxx_wdt_remove(struct platform_device *ofdev) |
| 249 | { | 249 | { |
| 250 | mpc8xxx_wdt_pr_warn("watchdog removed"); | 250 | mpc8xxx_wdt_pr_warn("watchdog removed"); |
| 251 | del_timer_sync(&wdt_timer); | 251 | del_timer_sync(&wdt_timer); |
| @@ -281,7 +281,7 @@ MODULE_DEVICE_TABLE(of, mpc8xxx_wdt_match); | |||
| 281 | 281 | ||
| 282 | static struct platform_driver mpc8xxx_wdt_driver = { | 282 | static struct platform_driver mpc8xxx_wdt_driver = { |
| 283 | .probe = mpc8xxx_wdt_probe, | 283 | .probe = mpc8xxx_wdt_probe, |
| 284 | .remove = __devexit_p(mpc8xxx_wdt_remove), | 284 | .remove = mpc8xxx_wdt_remove, |
| 285 | .driver = { | 285 | .driver = { |
| 286 | .name = "mpc8xxx_wdt", | 286 | .name = "mpc8xxx_wdt", |
| 287 | .owner = THIS_MODULE, | 287 | .owner = THIS_MODULE, |
