aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2014-06-30 21:13:06 +0100
committerRon Yorston <rmy@pobox.com>2014-06-30 21:13:06 +0100
commit099e8b6438345baae560a629d548af07a8c3125c (patch)
tree71b5600b22b0019af675e4a991394ce32c8207c5 /shell
parente19594cc6e49e78fa50a654f15cf9a04e77d054a (diff)
parent184b2669175e562d58894e22f6320cebf3316c25 (diff)
downloadbusybox-w32-099e8b6438345baae560a629d548af07a8c3125c.tar.gz
busybox-w32-099e8b6438345baae560a629d548af07a8c3125c.tar.bz2
busybox-w32-099e8b6438345baae560a629d548af07a8c3125c.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c
index c3e950893..550a98db6 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -13222,7 +13222,7 @@ timescmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
13222 const unsigned char *p; 13222 const unsigned char *p;
13223 struct tms buf; 13223 struct tms buf;
13224 13224
13225 clk_tck = sysconf(_SC_CLK_TCK); 13225 clk_tck = bb_clk_tck();
13226 times(&buf); 13226 times(&buf);
13227 13227
13228 p = timescmd_str; 13228 p = timescmd_str;