diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-01-19 10:27:30 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-01-19 10:27:30 -0500 |
| commit | 210b1847b32951f52d19df229972399e5b987de2 (patch) | |
| tree | be6eeb3ba76b4f4331c98d5ba47aa233bea8f22d /drivers/rtc/rtc-mxc.c | |
| parent | 93d5bf073a1e01035be66dc41860b9ae9aa9ccfa (diff) | |
| parent | d01723479e6a6c70c83295f7847477a016d5e14a (diff) | |
Merge branch 'for-rmk/virt/hyp-boot/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into fixes
Diffstat (limited to 'drivers/rtc/rtc-mxc.c')
| -rw-r--r-- | drivers/rtc/rtc-mxc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c index 7304139934aa..1c3ef7289565 100644 --- a/drivers/rtc/rtc-mxc.c +++ b/drivers/rtc/rtc-mxc.c | |||
| @@ -368,7 +368,7 @@ static struct rtc_class_ops mxc_rtc_ops = { | |||
| 368 | .alarm_irq_enable = mxc_rtc_alarm_irq_enable, | 368 | .alarm_irq_enable = mxc_rtc_alarm_irq_enable, |
| 369 | }; | 369 | }; |
| 370 | 370 | ||
| 371 | static int __devinit mxc_rtc_probe(struct platform_device *pdev) | 371 | static int mxc_rtc_probe(struct platform_device *pdev) |
| 372 | { | 372 | { |
| 373 | struct resource *res; | 373 | struct resource *res; |
| 374 | struct rtc_device *rtc; | 374 | struct rtc_device *rtc; |
| @@ -460,7 +460,7 @@ exit_free_pdata: | |||
| 460 | return ret; | 460 | return ret; |
| 461 | } | 461 | } |
| 462 | 462 | ||
| 463 | static int __devexit mxc_rtc_remove(struct platform_device *pdev) | 463 | static int mxc_rtc_remove(struct platform_device *pdev) |
| 464 | { | 464 | { |
| 465 | struct rtc_plat_data *pdata = platform_get_drvdata(pdev); | 465 | struct rtc_plat_data *pdata = platform_get_drvdata(pdev); |
| 466 | 466 | ||
| @@ -509,7 +509,7 @@ static struct platform_driver mxc_rtc_driver = { | |||
| 509 | }, | 509 | }, |
| 510 | .id_table = imx_rtc_devtype, | 510 | .id_table = imx_rtc_devtype, |
| 511 | .probe = mxc_rtc_probe, | 511 | .probe = mxc_rtc_probe, |
| 512 | .remove = __devexit_p(mxc_rtc_remove), | 512 | .remove = mxc_rtc_remove, |
| 513 | }; | 513 | }; |
| 514 | 514 | ||
| 515 | module_platform_driver(mxc_rtc_driver) | 515 | module_platform_driver(mxc_rtc_driver) |