---

yaml --- r: 330667 b: refs/heads/master c: ccc0e34 h: refs/heads/master i: 330665: 3054979 330663: e926390 v: v3
git-mirror · Aug 5, 2012 · 14fbf8d · 14fbf8d
1 parent 02d0be8
commit 14fbf8d
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 355b4b2b5e83986132c77326e2b97780480b8d69
+refs/heads/master: ccc0e3483c2447fd14d4fb9ba2a77da628322815
diff --git a/...k/drivers/media/dvb/dvb-usb/dvb-usb-ids.h → .../drivers/media/dvb/dvb-core/dvb-usb-ids.h b/...k/drivers/media/dvb/dvb-usb/dvb-usb-ids.h → .../drivers/media/dvb/dvb-core/dvb-usb-ids.h
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/dvb_usb.h b/trunk/drivers/media/dvb/dvb-usb-v2/dvb_usb.h
@@ -30,7 +30,7 @@
 #include "dvb_demux.h"
 #include "dvb_net.h"
 #include "dmxdev.h"
-#include "../dvb-usb/dvb-usb-ids.h"
+#include "dvb-usb-ids.h"
 
 /*
  * device file: /dev/dvb/adapter[0-1]/frontend[0-2]

diff --git a/trunk/drivers/media/dvb/dvb-usb/Makefile b/trunk/drivers/media/dvb/dvb-usb/Makefile
@@ -92,4 +92,3 @@ ccflags-y += -I$(srctree)/drivers/media/dvb/frontends/
 # due to tuner-xc3028
 ccflags-y += -I$(srctree)/drivers/media/common/tuners
 ccflags-y += -I$(srctree)/drivers/media/dvb/ttpci
-
diff --git a/trunk/drivers/media/video/cx231xx/Makefile b/trunk/drivers/media/video/cx231xx/Makefile
@@ -12,5 +12,4 @@ ccflags-y += -Idrivers/media/video
 ccflags-y += -Idrivers/media/common/tuners
 ccflags-y += -Idrivers/media/dvb/dvb-core
 ccflags-y += -Idrivers/media/dvb/frontends
-ccflags-y += -Idrivers/media/dvb/dvb-usb
Original file line number	Diff line number	Diff line change
Expand Up		@@ -92,4 +92,3 @@ ccflags-y += -I$(srctree)/drivers/media/dvb/frontends/
		# due to tuner-xc3028
		ccflags-y += -I$(srctree)/drivers/media/common/tuners
		ccflags-y += -I$(srctree)/drivers/media/dvb/ttpci