From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date: Wed, 2 Feb 2011 21:59:17 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.dorsal.polymtl.ca/home/git/ust
X-Git-Tag: v0.12~72
X-Git-Url: http://git.lttng.org/?a=commitdiff_plain;h=cacf036243594e11fc8a7e0f47f07af97a79042f;hp=2298f3297443ba26f761e272c45456ed857071bc;p=ust.git

Merge branch 'master' of ssh://git.dorsal.polymtl.ca/home/git/ust
---

diff --git a/tests/register_test/register_test.c b/tests/register_test/register_test.c
index 8b65ffb..90fca12 100644
--- a/tests/register_test/register_test.c
+++ b/tests/register_test/register_test.c
@@ -21,7 +21,6 @@
 #include <stdarg.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/timerfd.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <pthread.h>