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-rs5c313.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-rs5c313.c')
| -rw-r--r-- | drivers/rtc/rtc-rs5c313.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-rs5c313.c b/drivers/rtc/rtc-rs5c313.c index e3ff179b99ca..d1aee793ecc8 100644 --- a/drivers/rtc/rtc-rs5c313.c +++ b/drivers/rtc/rtc-rs5c313.c | |||
| @@ -377,7 +377,7 @@ static int rs5c313_rtc_probe(struct platform_device *pdev) | |||
| 377 | return 0; | 377 | return 0; |
| 378 | } | 378 | } |
| 379 | 379 | ||
| 380 | static int __devexit rs5c313_rtc_remove(struct platform_device *pdev) | 380 | static int rs5c313_rtc_remove(struct platform_device *pdev) |
| 381 | { | 381 | { |
| 382 | struct rtc_device *rtc = platform_get_drvdata( pdev ); | 382 | struct rtc_device *rtc = platform_get_drvdata( pdev ); |
| 383 | 383 | ||
| @@ -392,7 +392,7 @@ static struct platform_driver rs5c313_rtc_platform_driver = { | |||
| 392 | .owner = THIS_MODULE, | 392 | .owner = THIS_MODULE, |
| 393 | }, | 393 | }, |
| 394 | .probe = rs5c313_rtc_probe, | 394 | .probe = rs5c313_rtc_probe, |
| 395 | .remove = __devexit_p( rs5c313_rtc_remove ), | 395 | .remove = rs5c313_rtc_remove, |
| 396 | }; | 396 | }; |
| 397 | 397 | ||
| 398 | static int __init rs5c313_rtc_init(void) | 398 | static int __init rs5c313_rtc_init(void) |