summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu.herrb@laas.fr>2012-01-14 17:30:33 +0100
committerMatthieu Herrb <matthieu.herrb@laas.fr>2012-01-14 17:30:33 +0100
commit7d3ce2908d9747f7ac00e8950a8fa955811164a2 (patch)
treeb00e4ee0e65e2e3fed6f6932fdd8b3b0c395de97
parent9feb25df3eed21929816944bf251280663fa7791 (diff)
parent048c67d6f351083741ef68e94a278a445c16436d (diff)
Merge remote-tracking branch 'origin/master' into obsd
-rw-r--r--src/z4l.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/z4l.c b/src/z4l.c
index c6a7c58..a21e492 100644
--- a/src/z4l.c
+++ b/src/z4l.c
@@ -47,8 +47,6 @@
#include "xf86xv.h"
#include "fourcc.h"
-#include <linux/types.h>
-
#define __s64 __s_64
typedef long long __s64;