aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2012-08-05 18:50:15 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-08-05 18:53:26 -0400
commitccc0e3483c2447fd14d4fb9ba2a77da628322815 (patch)
treea3fdba5ca8e3ee2bbd001683135d0ef21f419a06 /drivers/media
parent355b4b2b5e83986132c77326e2b97780480b8d69 (diff)
[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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/dvb-core/dvb-usb-ids.h (renamed from drivers/media/dvb/dvb-usb/dvb-usb-ids.h)0
-rw-r--r--drivers/media/dvb/dvb-usb-v2/dvb_usb.h2
-rw-r--r--drivers/media/dvb/dvb-usb/Makefile1
-rw-r--r--drivers/media/video/cx231xx/Makefile1
4 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-core/dvb-usb-ids.h
index 26c44818a5ab..26c44818a5ab 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/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
index 4db591be646c..773817b5fe06 100644
--- a/drivers/media/dvb/dvb-usb-v2/dvb_usb.h
+++ b/drivers/media/dvb/dvb-usb-v2/dvb_usb.h
@@ -30,7 +30,7 @@
30#include "dvb_demux.h" 30#include "dvb_demux.h"
31#include "dvb_net.h" 31#include "dvb_net.h"
32#include "dmxdev.h" 32#include "dmxdev.h"
33#include "../dvb-usb/dvb-usb-ids.h" 33#include "dvb-usb-ids.h"
34 34
35/* 35/*
36 * device file: /dev/dvb/adapter[0-1]/frontend[0-2] 36 * 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
index 29fa0f0637e5..4b70599b38d9 100644
--- 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/
92# due to tuner-xc3028 92# due to tuner-xc3028
93ccflags-y += -I$(srctree)/drivers/media/common/tuners 93ccflags-y += -I$(srctree)/drivers/media/common/tuners
94ccflags-y += -I$(srctree)/drivers/media/dvb/ttpci 94ccflags-y += -I$(srctree)/drivers/media/dvb/ttpci
95
diff --git a/drivers/media/video/cx231xx/Makefile b/drivers/media/video/cx231xx/Makefile
index b3348975c7c2..cb06b022e011 100644
--- a/drivers/media/video/cx231xx/Makefile
+++ b/drivers/media/video/cx231xx/Makefile
@@ -12,5 +12,4 @@ ccflags-y += -Idrivers/media/video
12ccflags-y += -Idrivers/media/common/tuners 12ccflags-y += -Idrivers/media/common/tuners
13ccflags-y += -Idrivers/media/dvb/dvb-core 13ccflags-y += -Idrivers/media/dvb/dvb-core
14ccflags-y += -Idrivers/media/dvb/frontends 14ccflags-y += -Idrivers/media/dvb/frontends
15ccflags-y += -Idrivers/media/dvb/dvb-usb
16 15