diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-04 02:52:14 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-04 02:52:14 -0500 |
| commit | cb9c34e6d090d376b77becaa5d29a65dec7f4272 (patch) | |
| tree | 3678abce20d6825aebe3fec218057d4131e13fd6 /include/linux/mfd/wm8350/rtc.h | |
| parent | 470c66239ef0336429b35345f3f615d47341e13b (diff) | |
| parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) | |
Merge commit 'v2.6.28-rc7' into core/locking
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 |