diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /include/linux/mfd/wm8350/rtc.h | |
| parent | a3d732f93785da17e0137210deadb4616f5536fc (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/uv
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 |