Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/bnx2-2.6

[linux-2.6-omap-h63xx.git] / include / asm-arm / rtc.h

diff --git a/include/asm-arm/rtc.h b/include/asm-arm/rtc.h
index aa7e16b2e2255fbcc0f5aef2cf72c241daf2f81b..370dfe77589d2abd9d8a963772fc79072feba5c0 100644 (file)
--- a/include/asm-arm/rtc.h
+++ b/include/asm-arm/rtc.h
@@ -18,9 +18,9 @@ struct rtc_ops {
        void            (*release)(void);
        int             (*ioctl)(unsigned int, unsigned long);
 
-       void            (*read_time)(struct rtc_time *);
+       int             (*read_time)(struct rtc_time *);
        int             (*set_time)(struct rtc_time *);
-       void            (*read_alarm)(struct rtc_wkalrm *);
+       int             (*read_alarm)(struct rtc_wkalrm *);
        int             (*set_alarm)(struct rtc_wkalrm *);
        int             (*proc)(char *buf);
 };