diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-01 00:34:21 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-01 00:34:21 +0400 |
| commit | 49e7dc54cd4cbdb439ecc4e06214b0ca1a1a72b4 (patch) | |
| tree | d8c98e6ebdade1c73ea6926b6be3d86d9ade9cb6 /include | |
| parent | 9ea1f8f505f6f770bd593e689960ac4f893509b2 (diff) | |
| parent | bb9bffcbef6166cf03385fbcde97c27bc1a5e689 (diff) | |
| download | linux-49e7dc54cd4cbdb439ecc4e06214b0ca1a1a72b4.tar.xz | |
Merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/rtc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/rtc.h b/include/asm-arm/rtc.h index aa7e16b2e225..370dfe77589d 100644 --- 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); }; |