diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
| commit | dba0a918722ee0f0ba3442575e4448c3ab622be4 (patch) | |
| tree | fdb466cf09e7916135098d651b18924b2fe9ba5f /include/linux/mfd/wm8350/rtc.h | |
| parent | 0996e6382482ce9014787693d3884e9468153a5c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'include/linux/mfd/wm8350/rtc.h')
| -rw-r--r-- | include/linux/mfd/wm8350/rtc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mfd/wm8350/rtc.h b/include/linux/mfd/wm8350/rtc.h index dfda69e9f440..24add2bef6c9 100644 --- a/include/linux/mfd/wm8350/rtc.h +++ b/include/linux/mfd/wm8350/rtc.h | |||
| @@ -261,6 +261,8 @@ | |||
| 261 | 261 | ||
| 262 | struct wm8350_rtc { | 262 | struct wm8350_rtc { |
| 263 | struct platform_device *pdev; | 263 | struct platform_device *pdev; |
| 264 | struct rtc_device *rtc; | ||
| 265 | int alarm_enabled; /* used over suspend/resume */ | ||
| 264 | }; | 266 | }; |
| 265 | 267 | ||
| 266 | #endif | 268 | #endif |