From: Adam Sutton <dev@adamsutton.me.uk>
Date: Fri, 4 Apr 2014 14:02:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/pr/365'
X-Git-Tag: v4.1~2202
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e89bbe3f47aa8cbb32dccb4da5993e0260feb8b;p=thirdparty%2Ftvheadend.git

Merge remote-tracking branch 'origin/pr/365'
---

7e89bbe3f47aa8cbb32dccb4da5993e0260feb8b
diff --cc src/input/mpegts/scanfile.c
index 9f23c0b86,f1fdf7cac..bf540557c
--- a/src/input/mpegts/scanfile.c
+++ b/src/input/mpegts/scanfile.c
@@@ -17,9 -17,9 +17,9 @@@
   */
  
  #include "tvheadend.h"
- #include "../dvb.h"
+ #include "dvb.h"
  #include "filebundle.h"
 -#include "config2.h"
 +#include "config.h"
  #include "scanfile.h"
  
  #include <sys/types.h>