diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-21 05:21:15 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-21 05:21:15 -0500 |
| commit | de8853bc38ceab1fa7e7f723b21430d4aad60fea (patch) | |
| tree | 5084ef51866fd1767324f8dc8eb36e97c55350f5 /drivers/rtc/rtc-ds1302.c | |
| parent | f5de24b06aa46427500d0fdbe8616b73a71d8c28 (diff) | |
| parent | 440b004cf953bec2bc8cd91c64ae707fd7e25327 (diff) | |
Merge remote branch 'alsa/fixes' into fix/hda
Diffstat (limited to 'drivers/rtc/rtc-ds1302.c')
| -rw-r--r-- | drivers/rtc/rtc-ds1302.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-ds1302.c b/drivers/rtc/rtc-ds1302.c index d490628b64da..1e73c8f42e38 100644 --- a/drivers/rtc/rtc-ds1302.c +++ b/drivers/rtc/rtc-ds1302.c | |||
| @@ -201,7 +201,7 @@ static struct platform_driver ds1302_platform_driver = { | |||
| 201 | .name = DRV_NAME, | 201 | .name = DRV_NAME, |
| 202 | .owner = THIS_MODULE, | 202 | .owner = THIS_MODULE, |
| 203 | }, | 203 | }, |
| 204 | .remove = __exit_p(ds1302_rtc_remove), | 204 | .remove = __devexit_p(ds1302_rtc_remove), |
| 205 | }; | 205 | }; |
| 206 | 206 | ||
| 207 | static int __init ds1302_rtc_init(void) | 207 | static int __init ds1302_rtc_init(void) |