diff options
author | Dave Brolley <brolley@redhat.com> | 2009-06-17 12:17:15 -0400 |
---|---|---|
committer | Dave Brolley <brolley@redhat.com> | 2009-06-17 12:17:15 -0400 |
commit | ee1d2806c99c08e5ab0a056527714db7ab0edc45 (patch) | |
tree | 0605145b04b264fe6f2d82670c0cee7fcb6db97c /runtime | |
parent | 15c8284f31d0c1571e9454240f594b62701f2d07 (diff) | |
parent | ce12cdb401f988d28450bd9accf6fb1ccaf0a996 (diff) | |
download | systemtap-steved-ee1d2806c99c08e5ab0a056527714db7ab0edc45.tar.gz systemtap-steved-ee1d2806c99c08e5ab0a056527714db7ab0edc45.tar.xz systemtap-steved-ee1d2806c99c08e5ab0a056527714db7ab0edc45.zip |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/runtime.h | 1 | ||||
-rw-r--r-- | runtime/transport/transport.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/runtime/runtime.h b/runtime/runtime.h index c2e927cc..9881acb7 100644 --- a/runtime/runtime.h +++ b/runtime/runtime.h @@ -88,6 +88,7 @@ static struct #include "copy.c" #include "regs.c" #include "regs-ia64.c" +#include "time.c" #include "task_finder.c" diff --git a/runtime/transport/transport.c b/runtime/transport/transport.c index 1ab49ae2..318c62f1 100644 --- a/runtime/transport/transport.c +++ b/runtime/transport/transport.c @@ -17,7 +17,6 @@ #include <linux/delay.h> #include <linux/namei.h> #include "transport.h" -#include "time.c" #include "../mempool.c" #include "symbols.c" |