diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-15 14:38:29 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-15 14:38:29 -0400 |
| commit | e48d199ba10bb8267f491a3a585ca4a833e950a4 (patch) | |
| tree | c7d308a42479c8f21aaef889abfa004b0f1bb482 /drivers/rtc/rtc-omap.c | |
| parent | cce246ee5f3c7f4d3539ea41d13feb7a07859145 (diff) | |
| parent | 0de19a456cb59106420864927fdec152310f70b6 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/rtc/rtc-omap.c')
| -rw-r--r-- | drivers/rtc/rtc-omap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index a2f84f169588..58f81c774943 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c | |||
| @@ -497,7 +497,7 @@ static void omap_rtc_shutdown(struct platform_device *pdev) | |||
| 497 | rtc_write(0, OMAP_RTC_INTERRUPTS_REG); | 497 | rtc_write(0, OMAP_RTC_INTERRUPTS_REG); |
| 498 | } | 498 | } |
| 499 | 499 | ||
| 500 | MODULE_ALIAS("omap_rtc"); | 500 | MODULE_ALIAS("platform:omap_rtc"); |
| 501 | static struct platform_driver omap_rtc_driver = { | 501 | static struct platform_driver omap_rtc_driver = { |
| 502 | .probe = omap_rtc_probe, | 502 | .probe = omap_rtc_probe, |
| 503 | .remove = __devexit_p(omap_rtc_remove), | 503 | .remove = __devexit_p(omap_rtc_remove), |