diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
| commit | 9db69882bee2d528d706d61d34ef7741122330be (patch) | |
| tree | f46c4ed5cae58956cd165e552ea4e366fd9b1a6c /util-linux/rtcwake.c | |
| parent | 3f357a9c754805c4c38793749927aeda82797735 (diff) | |
| parent | e4dcba1c103dc28e927e004791e331aaf604383d (diff) | |
| download | busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.gz busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.bz2 busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.zip | |
Merge commit 'e4dcba1c103dc28e927e004791e331aaf604383d'
Conflicts:
libbb/make_directory.c
Diffstat (limited to 'util-linux/rtcwake.c')
| -rw-r--r-- | util-linux/rtcwake.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c index 26e5b4724..06ed7eafc 100644 --- a/util-linux/rtcwake.c +++ b/util-linux/rtcwake.c | |||
| @@ -50,7 +50,7 @@ static NOINLINE bool may_wakeup(const char *rtcname) | |||
| 50 | static NOINLINE void setup_alarm(int fd, time_t *wakeup, time_t rtc_time) | 50 | static NOINLINE void setup_alarm(int fd, time_t *wakeup, time_t rtc_time) |
| 51 | { | 51 | { |
| 52 | struct tm *ptm; | 52 | struct tm *ptm; |
| 53 | struct linux_rtc_wkalrm wake; | 53 | struct linux_rtc_wkalrm wake; |
| 54 | 54 | ||
| 55 | /* The wakeup time is in POSIX time (more or less UTC). | 55 | /* The wakeup time is in POSIX time (more or less UTC). |
| 56 | * Ideally RTCs use that same time; but PCs can't do that | 56 | * Ideally RTCs use that same time; but PCs can't do that |