summaryrefslogtreecommitdiff
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-04 10:52:14 +0300
committerIngo Molnar <mingo@elte.hu>2008-12-04 10:52:14 +0300
commitcb9c34e6d090d376b77becaa5d29a65dec7f4272 (patch)
tree3678abce20d6825aebe3fec218057d4131e13fd6 /include/linux/mfd
parent470c66239ef0336429b35345f3f615d47341e13b (diff)
parent061e41fdb5047b1fb161e89664057835935ca1d2 (diff)
downloadlinux-cb9c34e6d090d376b77becaa5d29a65dec7f4272.tar.xz
Merge commit 'v2.6.28-rc7' into core/locking
Diffstat (limited to 'include/linux/mfd')
-rw-r--r--include/linux/mfd/wm8350/rtc.h2
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 @@
struct wm8350_rtc {
struct platform_device *pdev;
+ struct rtc_device *rtc;
+ int alarm_enabled; /* used over suspend/resume */
};
#endif