diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-18 12:17:17 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-18 12:17:17 -0500 |
| commit | cbf50a4125f5242dd70b1f2342dbba2d94c6d94e (patch) | |
| tree | a97a067e53f32e246034fbbb07e2c0894c279391 /drivers/rtc/rtc-davinci.c | |
| parent | 7a8ea7ebe4cf698918e7d3c860587e815eaa0f28 (diff) | |
| parent | 7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff) | |
Merge 3.8-rc4 into usb-next
This pulls in all of the -rc4 fixes into usb-next to sync things up.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/rtc/rtc-davinci.c')
| -rw-r--r-- | drivers/rtc/rtc-davinci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c index 07cd03eae606..5f7982f7c1b5 100644 --- a/drivers/rtc/rtc-davinci.c +++ b/drivers/rtc/rtc-davinci.c | |||
| @@ -567,7 +567,7 @@ fail2: | |||
| 567 | return ret; | 567 | return ret; |
| 568 | } | 568 | } |
| 569 | 569 | ||
| 570 | static int __devexit davinci_rtc_remove(struct platform_device *pdev) | 570 | static int davinci_rtc_remove(struct platform_device *pdev) |
| 571 | { | 571 | { |
| 572 | struct davinci_rtc *davinci_rtc = platform_get_drvdata(pdev); | 572 | struct davinci_rtc *davinci_rtc = platform_get_drvdata(pdev); |
| 573 | 573 | ||
| @@ -589,7 +589,7 @@ static int __devexit davinci_rtc_remove(struct platform_device *pdev) | |||
| 589 | 589 | ||
| 590 | static struct platform_driver davinci_rtc_driver = { | 590 | static struct platform_driver davinci_rtc_driver = { |
| 591 | .probe = davinci_rtc_probe, | 591 | .probe = davinci_rtc_probe, |
| 592 | .remove = __devexit_p(davinci_rtc_remove), | 592 | .remove = davinci_rtc_remove, |
| 593 | .driver = { | 593 | .driver = { |
| 594 | .name = "rtc_davinci", | 594 | .name = "rtc_davinci", |
| 595 | .owner = THIS_MODULE, | 595 | .owner = THIS_MODULE, |