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-test.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-test.c')
| -rw-r--r-- | drivers/rtc/rtc-test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c index 974b9ae252ab..b92e0f6383e6 100644 --- a/drivers/rtc/rtc-test.c +++ b/drivers/rtc/rtc-test.c | |||
| @@ -119,7 +119,7 @@ err: | |||
| 119 | return err; | 119 | return err; |
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | static int __devexit test_remove(struct platform_device *plat_dev) | 122 | static int test_remove(struct platform_device *plat_dev) |
| 123 | { | 123 | { |
| 124 | struct rtc_device *rtc = platform_get_drvdata(plat_dev); | 124 | struct rtc_device *rtc = platform_get_drvdata(plat_dev); |
| 125 | 125 | ||
| @@ -131,7 +131,7 @@ static int __devexit test_remove(struct platform_device *plat_dev) | |||
| 131 | 131 | ||
| 132 | static struct platform_driver test_driver = { | 132 | static struct platform_driver test_driver = { |
| 133 | .probe = test_probe, | 133 | .probe = test_probe, |
| 134 | .remove = __devexit_p(test_remove), | 134 | .remove = test_remove, |
| 135 | .driver = { | 135 | .driver = { |
| 136 | .name = "rtc-test", | 136 | .name = "rtc-test", |
| 137 | .owner = THIS_MODULE, | 137 | .owner = THIS_MODULE, |