diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/rtc/rtc-wm831x.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/rtc/rtc-wm831x.c')
| -rw-r--r-- | drivers/rtc/rtc-wm831x.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-wm831x.c b/drivers/rtc/rtc-wm831x.c index 79795cdf6ed8..b16cfe57a484 100644 --- a/drivers/rtc/rtc-wm831x.c +++ b/drivers/rtc/rtc-wm831x.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/time.h> | 17 | #include <linux/time.h> |
| 18 | #include <linux/rtc.h> | 18 | #include <linux/rtc.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/bcd.h> | 20 | #include <linux/bcd.h> |
| 20 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 21 | #include <linux/ioctl.h> | 22 | #include <linux/ioctl.h> |
| @@ -485,7 +486,7 @@ static int __devexit wm831x_rtc_remove(struct platform_device *pdev) | |||
| 485 | return 0; | 486 | return 0; |
| 486 | } | 487 | } |
| 487 | 488 | ||
| 488 | static struct dev_pm_ops wm831x_rtc_pm_ops = { | 489 | static const struct dev_pm_ops wm831x_rtc_pm_ops = { |
| 489 | .suspend = wm831x_rtc_suspend, | 490 | .suspend = wm831x_rtc_suspend, |
| 490 | .resume = wm831x_rtc_resume, | 491 | .resume = wm831x_rtc_resume, |
| 491 | 492 | ||