[media] move dvb-usb-ids.h to dvb-core

While this header were meant to be used just by dvb-usb driver, it is now being used also by dvb-usb-v2 and cx231xx. So, move it to a better place. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
git-mirror · Aug 5, 2012 · ccc0e34 · ccc0e34
1 parent 355b4b2
commit ccc0e34
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 3 deletions.
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h → drivers/media/dvb/dvb-core/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h → drivers/media/dvb/dvb-core/dvb-usb-ids.h
diff --git a/drivers/media/dvb/dvb-usb-v2/dvb_usb.h b/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/drivers/media/dvb/dvb-usb/Makefile b/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/drivers/media/video/cx231xx/Makefile b/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