aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2012-06-14 15:35:53 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-08-13 22:08:14 -0400
commit3d6c2bc08ac4f75bf3597740357c98f2207ca412 (patch)
treedfe6d7c9e466cef06224ffadd3310d61f41a4678
parent5bc3cb743bbab408792c1b4ef31adf6268aa4b7e (diff)
[media] dvb: move the dvb core one level up
just like the V4L2 core, move the DVB core to drivers/media, as the intention is to get rid of both "video" and "dvb" directories. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/Kconfig1
-rw-r--r--drivers/media/Makefile2
-rw-r--r--drivers/media/common/tuners/Makefile2
-rw-r--r--drivers/media/dvb-core/Kconfig29
-rw-r--r--drivers/media/dvb-core/Makefile (renamed from drivers/media/dvb/dvb-core/Makefile)0
-rw-r--r--drivers/media/dvb-core/demux.h (renamed from drivers/media/dvb/dvb-core/demux.h)0
-rw-r--r--drivers/media/dvb-core/dmxdev.c (renamed from drivers/media/dvb/dvb-core/dmxdev.c)0
-rw-r--r--drivers/media/dvb-core/dmxdev.h (renamed from drivers/media/dvb/dvb-core/dmxdev.h)0
-rw-r--r--drivers/media/dvb-core/dvb-usb-ids.h (renamed from drivers/media/dvb/dvb-core/dvb-usb-ids.h)0
-rw-r--r--drivers/media/dvb-core/dvb_ca_en50221.c (renamed from drivers/media/dvb/dvb-core/dvb_ca_en50221.c)0
-rw-r--r--drivers/media/dvb-core/dvb_ca_en50221.h (renamed from drivers/media/dvb/dvb-core/dvb_ca_en50221.h)0
-rw-r--r--drivers/media/dvb-core/dvb_demux.c (renamed from drivers/media/dvb/dvb-core/dvb_demux.c)0
-rw-r--r--drivers/media/dvb-core/dvb_demux.h (renamed from drivers/media/dvb/dvb-core/dvb_demux.h)0
-rw-r--r--drivers/media/dvb-core/dvb_filter.c (renamed from drivers/media/dvb/dvb-core/dvb_filter.c)0
-rw-r--r--drivers/media/dvb-core/dvb_filter.h (renamed from drivers/media/dvb/dvb-core/dvb_filter.h)0
-rw-r--r--drivers/media/dvb-core/dvb_frontend.c (renamed from drivers/media/dvb/dvb-core/dvb_frontend.c)0
-rw-r--r--drivers/media/dvb-core/dvb_frontend.h (renamed from drivers/media/dvb/dvb-core/dvb_frontend.h)0
-rw-r--r--drivers/media/dvb-core/dvb_math.c (renamed from drivers/media/dvb/dvb-core/dvb_math.c)0
-rw-r--r--drivers/media/dvb-core/dvb_math.h (renamed from drivers/media/dvb/dvb-core/dvb_math.h)0
-rw-r--r--drivers/media/dvb-core/dvb_net.c (renamed from drivers/media/dvb/dvb-core/dvb_net.c)0
-rw-r--r--drivers/media/dvb-core/dvb_net.h (renamed from drivers/media/dvb/dvb-core/dvb_net.h)0
-rw-r--r--drivers/media/dvb-core/dvb_ringbuffer.c (renamed from drivers/media/dvb/dvb-core/dvb_ringbuffer.c)0
-rw-r--r--drivers/media/dvb-core/dvb_ringbuffer.h (renamed from drivers/media/dvb/dvb-core/dvb_ringbuffer.h)0
-rw-r--r--drivers/media/dvb-core/dvbdev.c (renamed from drivers/media/dvb/dvb-core/dvbdev.c)0
-rw-r--r--drivers/media/dvb-core/dvbdev.h (renamed from drivers/media/dvb/dvb-core/dvbdev.h)0
-rw-r--r--drivers/media/dvb/Kconfig26
-rw-r--r--drivers/media/dvb/Makefile3
-rw-r--r--drivers/media/dvb/b2c2/Makefile2
-rw-r--r--drivers/media/dvb/bt8xx/Makefile2
-rw-r--r--drivers/media/dvb/ddbridge/Makefile2
-rw-r--r--drivers/media/dvb/dm1105/Makefile2
-rw-r--r--drivers/media/dvb/dvb-usb-v2/Makefile2
-rw-r--r--drivers/media/dvb/dvb-usb/Makefile2
-rw-r--r--drivers/media/dvb/firewire/Makefile2
-rw-r--r--drivers/media/dvb/frontends/Makefile2
-rw-r--r--drivers/media/dvb/mantis/Makefile2
-rw-r--r--drivers/media/dvb/ngene/Makefile2
-rw-r--r--drivers/media/dvb/pluto2/Makefile2
-rw-r--r--drivers/media/dvb/pt1/Makefile2
-rw-r--r--drivers/media/dvb/siano/Makefile2
-rw-r--r--drivers/media/dvb/ttpci/Makefile2
-rw-r--r--drivers/media/dvb/ttusb-budget/Makefile2
-rw-r--r--drivers/media/dvb/ttusb-dec/Makefile2
-rw-r--r--drivers/media/v4l2-core/Makefile2
-rw-r--r--drivers/media/video/Makefile2
-rw-r--r--drivers/media/video/au0828/Makefile2
-rw-r--r--drivers/media/video/bt8xx/Makefile2
-rw-r--r--drivers/media/video/cx18/Makefile2
-rw-r--r--drivers/media/video/cx231xx/Makefile2
-rw-r--r--drivers/media/video/cx23885/Makefile2
-rw-r--r--drivers/media/video/cx25821/Makefile2
-rw-r--r--drivers/media/video/cx88/Makefile2
-rw-r--r--drivers/media/video/em28xx/Makefile2
-rw-r--r--drivers/media/video/ivtv/Makefile2
-rw-r--r--drivers/media/video/pvrusb2/Makefile2
-rw-r--r--drivers/media/video/saa7134/Makefile2
-rw-r--r--drivers/media/video/saa7164/Makefile2
-rw-r--r--drivers/media/video/tlg2300/Makefile2
-rw-r--r--drivers/media/video/tm6000/Makefile2
-rw-r--r--drivers/staging/media/as102/Makefile2
-rw-r--r--drivers/staging/media/cxd2099/Makefile2
-rw-r--r--drivers/staging/media/go7007/Makefile2
62 files changed, 68 insertions, 65 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index e6253628059a..bda568af986f 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -161,6 +161,7 @@ source "drivers/media/radio/Kconfig"
161# DVB adapters 161# DVB adapters
162# 162#
163 163
164source "drivers/media/dvb-core/Kconfig"
164source "drivers/media/dvb/Kconfig" 165source "drivers/media/dvb/Kconfig"
165 166
166endif # MEDIA_SUPPORT 167endif # MEDIA_SUPPORT
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 2f9abaad18f7..7f9f99ab6ccc 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -11,4 +11,4 @@ endif
11obj-y += v4l2-core/ common/ rc/ video/ 11obj-y += v4l2-core/ common/ rc/ video/
12 12
13obj-$(CONFIG_VIDEO_DEV) += radio/ 13obj-$(CONFIG_VIDEO_DEV) += radio/
14obj-$(CONFIG_DVB_CORE) += dvb/ 14obj-$(CONFIG_DVB_CORE) += dvb-core/ dvb/
diff --git a/drivers/media/common/tuners/Makefile b/drivers/media/common/tuners/Makefile
index 891b80e60808..2ddbb2cf0e2c 100644
--- a/drivers/media/common/tuners/Makefile
+++ b/drivers/media/common/tuners/Makefile
@@ -33,5 +33,5 @@ obj-$(CONFIG_MEDIA_TUNER_FC0011) += fc0011.o
33obj-$(CONFIG_MEDIA_TUNER_FC0012) += fc0012.o 33obj-$(CONFIG_MEDIA_TUNER_FC0012) += fc0012.o
34obj-$(CONFIG_MEDIA_TUNER_FC0013) += fc0013.o 34obj-$(CONFIG_MEDIA_TUNER_FC0013) += fc0013.o
35 35
36ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core 36ccflags-y += -I$(srctree)/drivers/media/dvb-core
37ccflags-y += -I$(srctree)/drivers/media/dvb/frontends 37ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
diff --git a/drivers/media/dvb-core/Kconfig b/drivers/media/dvb-core/Kconfig
new file mode 100644
index 000000000000..fa7a2490ed5f
--- /dev/null
+++ b/drivers/media/dvb-core/Kconfig
@@ -0,0 +1,29 @@
1#
2# DVB device configuration
3#
4
5config DVB_MAX_ADAPTERS
6 int "maximum number of DVB/ATSC adapters"
7 depends on DVB_CORE
8 default 8
9 range 1 255
10 help
11 Maximum number of DVB/ATSC adapters. Increasing this number
12 increases the memory consumption of the DVB subsystem even
13 if a much lower number of DVB/ATSC adapters is present.
14 Only values in the range 4-32 are tested.
15
16 If you are unsure about this, use the default value 8
17
18config DVB_DYNAMIC_MINORS
19 bool "Dynamic DVB minor allocation"
20 depends on DVB_CORE
21 default n
22 help
23 If you say Y here, the DVB subsystem will use dynamic minor
24 allocation for any device that uses the DVB major number.
25 This means that you can have more than 4 of a single type
26 of device (like demuxes and frontends) per adapter, but udev
27 will be required to manage the device nodes.
28
29 If you are unsure about this, say N here.
diff --git a/drivers/media/dvb/dvb-core/Makefile b/drivers/media/dvb-core/Makefile
index 8f22bcd7c1f9..8f22bcd7c1f9 100644
--- a/drivers/media/dvb/dvb-core/Makefile
+++ b/drivers/media/dvb-core/Makefile
diff --git a/drivers/media/dvb/dvb-core/demux.h b/drivers/media/dvb-core/demux.h
index eb91fd808c16..eb91fd808c16 100644
--- a/drivers/media/dvb/dvb-core/demux.h
+++ b/drivers/media/dvb-core/demux.h
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
index 889c9c16c6df..889c9c16c6df 100644
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb-core/dmxdev.c
diff --git a/drivers/media/dvb/dvb-core/dmxdev.h b/drivers/media/dvb-core/dmxdev.h
index 02ebe28f830d..02ebe28f830d 100644
--- a/drivers/media/dvb/dvb-core/dmxdev.h
+++ b/drivers/media/dvb-core/dmxdev.h
diff --git a/drivers/media/dvb/dvb-core/dvb-usb-ids.h b/drivers/media/dvb-core/dvb-usb-ids.h
index 26c44818a5ab..26c44818a5ab 100644
--- a/drivers/media/dvb/dvb-core/dvb-usb-ids.h
+++ b/drivers/media/dvb-core/dvb-usb-ids.h
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c
index 9be65a3b931f..9be65a3b931f 100644
--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb-core/dvb_ca_en50221.c
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.h b/drivers/media/dvb-core/dvb_ca_en50221.h
index 7df2e141187a..7df2e141187a 100644
--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.h
+++ b/drivers/media/dvb-core/dvb_ca_en50221.h
diff --git a/drivers/media/dvb/dvb-core/dvb_demux.c b/drivers/media/dvb-core/dvb_demux.c
index 17cb81fd194c..17cb81fd194c 100644
--- a/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/drivers/media/dvb-core/dvb_demux.c
diff --git a/drivers/media/dvb/dvb-core/dvb_demux.h b/drivers/media/dvb-core/dvb_demux.h
index fa7188a253aa..fa7188a253aa 100644
--- a/drivers/media/dvb/dvb-core/dvb_demux.h
+++ b/drivers/media/dvb-core/dvb_demux.h
diff --git a/drivers/media/dvb/dvb-core/dvb_filter.c b/drivers/media/dvb-core/dvb_filter.c
index 772003fb1821..772003fb1821 100644
--- a/drivers/media/dvb/dvb-core/dvb_filter.c
+++ b/drivers/media/dvb-core/dvb_filter.c
diff --git a/drivers/media/dvb/dvb-core/dvb_filter.h b/drivers/media/dvb-core/dvb_filter.h
index 375e3be184b1..375e3be184b1 100644
--- a/drivers/media/dvb/dvb-core/dvb_filter.h
+++ b/drivers/media/dvb-core/dvb_filter.h
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
index 12e5eb1fff76..12e5eb1fff76 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb-core/dvb_frontend.h
index de410cc94fbb..de410cc94fbb 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb-core/dvb_frontend.h
diff --git a/drivers/media/dvb/dvb-core/dvb_math.c b/drivers/media/dvb-core/dvb_math.c
index beb7c93aa6cb..beb7c93aa6cb 100644
--- a/drivers/media/dvb/dvb-core/dvb_math.c
+++ b/drivers/media/dvb-core/dvb_math.c
diff --git a/drivers/media/dvb/dvb-core/dvb_math.h b/drivers/media/dvb-core/dvb_math.h
index aecc867e9404..aecc867e9404 100644
--- a/drivers/media/dvb/dvb-core/dvb_math.h
+++ b/drivers/media/dvb-core/dvb_math.h
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_net.c
index 8766ce8c354d..8766ce8c354d 100644
--- a/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/drivers/media/dvb-core/dvb_net.c
diff --git a/drivers/media/dvb/dvb-core/dvb_net.h b/drivers/media/dvb-core/dvb_net.h
index 1e53acd50cf4..1e53acd50cf4 100644
--- a/drivers/media/dvb/dvb-core/dvb_net.h
+++ b/drivers/media/dvb-core/dvb_net.h
diff --git a/drivers/media/dvb/dvb-core/dvb_ringbuffer.c b/drivers/media/dvb-core/dvb_ringbuffer.c
index a5712cd7c65f..a5712cd7c65f 100644
--- a/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
+++ b/drivers/media/dvb-core/dvb_ringbuffer.c
diff --git a/drivers/media/dvb/dvb-core/dvb_ringbuffer.h b/drivers/media/dvb-core/dvb_ringbuffer.h
index 41f04dae69b6..41f04dae69b6 100644
--- a/drivers/media/dvb/dvb-core/dvb_ringbuffer.h
+++ b/drivers/media/dvb-core/dvb_ringbuffer.h
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
index 39eab73b01ae..39eab73b01ae 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb-core/dvbdev.c
diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb-core/dvbdev.h
index 93a9470d3f0c..93a9470d3f0c 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.h
+++ b/drivers/media/dvb-core/dvbdev.h
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index 3a6ccbc02add..5a2c4bd75480 100644
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -2,32 +2,6 @@
2# DVB device configuration 2# DVB device configuration
3# 3#
4 4
5config DVB_MAX_ADAPTERS
6 int "maximum number of DVB/ATSC adapters"
7 depends on DVB_CORE
8 default 8
9 range 1 255
10 help
11 Maximum number of DVB/ATSC adapters. Increasing this number
12 increases the memory consumption of the DVB subsystem even
13 if a much lower number of DVB/ATSC adapters is present.
14 Only values in the range 4-32 are tested.
15
16 If you are unsure about this, use the default value 8
17
18config DVB_DYNAMIC_MINORS
19 bool "Dynamic DVB minor allocation"
20 depends on DVB_CORE
21 default n
22 help
23 If you say Y here, the DVB subsystem will use dynamic minor
24 allocation for any device that uses the DVB major number.
25 This means that you can have more than 4 of a single type
26 of device (like demuxes and frontends) per adapter, but udev
27 will be required to manage the device nodes.
28
29 If you are unsure about this, say N here.
30
31menuconfig DVB_CAPTURE_DRIVERS 5menuconfig DVB_CAPTURE_DRIVERS
32 bool "DVB/ATSC adapters" 6 bool "DVB/ATSC adapters"
33 depends on DVB_CORE 7 depends on DVB_CORE
diff --git a/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile
index 8f7e0129d70e..b14aa9dd0156 100644
--- a/drivers/media/dvb/Makefile
+++ b/drivers/media/dvb/Makefile
@@ -2,8 +2,7 @@
2# Makefile for the kernel multimedia device drivers. 2# Makefile for the kernel multimedia device drivers.
3# 3#
4 4
5obj-y := dvb-core/ \ 5obj-y := frontends/ \
6 frontends/ \
7 ttpci/ \ 6 ttpci/ \
8 ttusb-dec/ \ 7 ttusb-dec/ \
9 ttusb-budget/ \ 8 ttusb-budget/ \
diff --git a/drivers/media/dvb/b2c2/Makefile b/drivers/media/dvb/b2c2/Makefile
index 3d04a8dba99e..e4291e4aba23 100644
--- a/drivers/media/dvb/b2c2/Makefile
+++ b/drivers/media/dvb/b2c2/Makefile
@@ -12,5 +12,5 @@ obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o
12b2c2-flexcop-usb-objs = flexcop-usb.o 12b2c2-flexcop-usb-objs = flexcop-usb.o
13obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o 13obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o
14 14
15ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ 15ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/
16ccflags-y += -Idrivers/media/common/tuners/ 16ccflags-y += -Idrivers/media/common/tuners/
diff --git a/drivers/media/dvb/bt8xx/Makefile b/drivers/media/dvb/bt8xx/Makefile
index 0713b3af2050..7c2dd04d37e4 100644
--- a/drivers/media/dvb/bt8xx/Makefile
+++ b/drivers/media/dvb/bt8xx/Makefile
@@ -1,6 +1,6 @@
1obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o 1obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
2 2
3ccflags-y += -Idrivers/media/dvb/dvb-core 3ccflags-y += -Idrivers/media/dvb-core
4ccflags-y += -Idrivers/media/dvb/frontends 4ccflags-y += -Idrivers/media/dvb/frontends
5ccflags-y += -Idrivers/media/video/bt8xx 5ccflags-y += -Idrivers/media/video/bt8xx
6ccflags-y += -Idrivers/media/common/tuners 6ccflags-y += -Idrivers/media/common/tuners
diff --git a/drivers/media/dvb/ddbridge/Makefile b/drivers/media/dvb/ddbridge/Makefile
index 38019bafb862..9eca27dd7328 100644
--- a/drivers/media/dvb/ddbridge/Makefile
+++ b/drivers/media/dvb/ddbridge/Makefile
@@ -6,7 +6,7 @@ ddbridge-objs := ddbridge-core.o
6 6
7obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o 7obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o
8 8
9ccflags-y += -Idrivers/media/dvb/dvb-core/ 9ccflags-y += -Idrivers/media/dvb-core/
10ccflags-y += -Idrivers/media/dvb/frontends/ 10ccflags-y += -Idrivers/media/dvb/frontends/
11ccflags-y += -Idrivers/media/common/tuners/ 11ccflags-y += -Idrivers/media/common/tuners/
12 12
diff --git a/drivers/media/dvb/dm1105/Makefile b/drivers/media/dvb/dm1105/Makefile
index 95a008b71fe5..0dc5963ee807 100644
--- a/drivers/media/dvb/dm1105/Makefile
+++ b/drivers/media/dvb/dm1105/Makefile
@@ -1,3 +1,3 @@
1obj-$(CONFIG_DVB_DM1105) += dm1105.o 1obj-$(CONFIG_DVB_DM1105) += dm1105.o
2 2
3ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends 3ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends
diff --git a/drivers/media/dvb/dvb-usb-v2/Makefile b/drivers/media/dvb/dvb-usb-v2/Makefile
index 61b0f53669e8..9fef543dac21 100644
--- a/drivers/media/dvb/dvb-usb-v2/Makefile
+++ b/drivers/media/dvb/dvb-usb-v2/Makefile
@@ -42,7 +42,7 @@ obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-tuner.o
42dvb-usb-rtl28xxu-objs = rtl28xxu.o 42dvb-usb-rtl28xxu-objs = rtl28xxu.o
43obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o 43obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o
44 44
45ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core 45ccflags-y += -I$(srctree)/drivers/media/dvb-core
46ccflags-y += -I$(srctree)/drivers/media/dvb/frontends/ 46ccflags-y += -I$(srctree)/drivers/media/dvb/frontends/
47ccflags-y += -I$(srctree)/drivers/media/common/tuners 47ccflags-y += -I$(srctree)/drivers/media/common/tuners
48 48
diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile
index 061d5448fa1e..cc95b116bbc2 100644
--- a/drivers/media/dvb/dvb-usb/Makefile
+++ b/drivers/media/dvb/dvb-usb/Makefile
@@ -75,7 +75,7 @@ obj-$(CONFIG_DVB_USB_AZ6027) += dvb-usb-az6027.o
75dvb-usb-technisat-usb2-objs = technisat-usb2.o 75dvb-usb-technisat-usb2-objs = technisat-usb2.o
76obj-$(CONFIG_DVB_USB_TECHNISAT_USB2) += dvb-usb-technisat-usb2.o 76obj-$(CONFIG_DVB_USB_TECHNISAT_USB2) += dvb-usb-technisat-usb2.o
77 77
78ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core 78ccflags-y += -I$(srctree)/drivers/media/dvb-core
79ccflags-y += -I$(srctree)/drivers/media/dvb/frontends/ 79ccflags-y += -I$(srctree)/drivers/media/dvb/frontends/
80# due to tuner-xc3028 80# due to tuner-xc3028
81ccflags-y += -I$(srctree)/drivers/media/common/tuners 81ccflags-y += -I$(srctree)/drivers/media/common/tuners
diff --git a/drivers/media/dvb/firewire/Makefile b/drivers/media/dvb/firewire/Makefile
index 357b3aab186b..f3148138c963 100644
--- a/drivers/media/dvb/firewire/Makefile
+++ b/drivers/media/dvb/firewire/Makefile
@@ -3,4 +3,4 @@ obj-$(CONFIG_DVB_FIREDTV) += firedtv.o
3firedtv-y := firedtv-avc.o firedtv-ci.o firedtv-dvb.o firedtv-fe.o firedtv-fw.o 3firedtv-y := firedtv-avc.o firedtv-ci.o firedtv-dvb.o firedtv-fe.o firedtv-fw.o
4firedtv-$(CONFIG_DVB_FIREDTV_INPUT) += firedtv-rc.o 4firedtv-$(CONFIG_DVB_FIREDTV_INPUT) += firedtv-rc.o
5 5
6ccflags-y += -Idrivers/media/dvb/dvb-core 6ccflags-y += -Idrivers/media/dvb-core
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile
index 185bb8b51952..a378c5293764 100644
--- a/drivers/media/dvb/frontends/Makefile
+++ b/drivers/media/dvb/frontends/Makefile
@@ -2,7 +2,7 @@
2# Makefile for the kernel DVB frontend device drivers. 2# Makefile for the kernel DVB frontend device drivers.
3# 3#
4 4
5ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core/ 5ccflags-y += -I$(srctree)/drivers/media/dvb-core/
6ccflags-y += -I$(srctree)/drivers/media/common/tuners/ 6ccflags-y += -I$(srctree)/drivers/media/common/tuners/
7 7
8stb0899-objs = stb0899_drv.o stb0899_algo.o 8stb0899-objs = stb0899_drv.o stb0899_algo.o
diff --git a/drivers/media/dvb/mantis/Makefile b/drivers/media/dvb/mantis/Makefile
index ec8116dcb368..338411917361 100644
--- a/drivers/media/dvb/mantis/Makefile
+++ b/drivers/media/dvb/mantis/Makefile
@@ -25,4 +25,4 @@ obj-$(CONFIG_MANTIS_CORE) += mantis_core.o
25obj-$(CONFIG_DVB_MANTIS) += mantis.o 25obj-$(CONFIG_DVB_MANTIS) += mantis.o
26obj-$(CONFIG_DVB_HOPPER) += hopper.o 26obj-$(CONFIG_DVB_HOPPER) += hopper.o
27 27
28ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ 28ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/
diff --git a/drivers/media/dvb/ngene/Makefile b/drivers/media/dvb/ngene/Makefile
index 13ebeffb705f..dae76597fc31 100644
--- a/drivers/media/dvb/ngene/Makefile
+++ b/drivers/media/dvb/ngene/Makefile
@@ -6,7 +6,7 @@ ngene-objs := ngene-core.o ngene-i2c.o ngene-cards.o ngene-dvb.o
6 6
7obj-$(CONFIG_DVB_NGENE) += ngene.o 7obj-$(CONFIG_DVB_NGENE) += ngene.o
8 8
9ccflags-y += -Idrivers/media/dvb/dvb-core/ 9ccflags-y += -Idrivers/media/dvb-core/
10ccflags-y += -Idrivers/media/dvb/frontends/ 10ccflags-y += -Idrivers/media/dvb/frontends/
11ccflags-y += -Idrivers/media/common/tuners/ 11ccflags-y += -Idrivers/media/common/tuners/
12 12
diff --git a/drivers/media/dvb/pluto2/Makefile b/drivers/media/dvb/pluto2/Makefile
index 700822350ec5..14fa5789c748 100644
--- a/drivers/media/dvb/pluto2/Makefile
+++ b/drivers/media/dvb/pluto2/Makefile
@@ -1,3 +1,3 @@
1obj-$(CONFIG_DVB_PLUTO2) += pluto2.o 1obj-$(CONFIG_DVB_PLUTO2) += pluto2.o
2 2
3ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ 3ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/
diff --git a/drivers/media/dvb/pt1/Makefile b/drivers/media/dvb/pt1/Makefile
index d80d8e8e7c57..c80492a1039e 100644
--- a/drivers/media/dvb/pt1/Makefile
+++ b/drivers/media/dvb/pt1/Makefile
@@ -2,4 +2,4 @@ earth-pt1-objs := pt1.o va1j5jf8007s.o va1j5jf8007t.o
2 2
3obj-$(CONFIG_DVB_PT1) += earth-pt1.o 3obj-$(CONFIG_DVB_PT1) += earth-pt1.o
4 4
5ccflags-y += -Idrivers/media/dvb/dvb-core -Idrivers/media/dvb/frontends 5ccflags-y += -Idrivers/media/dvb-core -Idrivers/media/dvb/frontends
diff --git a/drivers/media/dvb/siano/Makefile b/drivers/media/dvb/siano/Makefile
index f233b57c86fb..14756bdb6eaa 100644
--- a/drivers/media/dvb/siano/Makefile
+++ b/drivers/media/dvb/siano/Makefile
@@ -5,7 +5,7 @@ obj-$(CONFIG_SMS_SIANO_MDTV) += smsmdtv.o smsdvb.o
5obj-$(CONFIG_SMS_USB_DRV) += smsusb.o 5obj-$(CONFIG_SMS_USB_DRV) += smsusb.o
6obj-$(CONFIG_SMS_SDIO_DRV) += smssdio.o 6obj-$(CONFIG_SMS_SDIO_DRV) += smssdio.o
7 7
8ccflags-y += -Idrivers/media/dvb/dvb-core 8ccflags-y += -Idrivers/media/dvb-core
9 9
10ccflags-y += $(extra-cflags-y) $(extra-cflags-m) 10ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
11 11
diff --git a/drivers/media/dvb/ttpci/Makefile b/drivers/media/dvb/ttpci/Makefile
index f6e869372e30..b0ddb4544cb7 100644
--- a/drivers/media/dvb/ttpci/Makefile
+++ b/drivers/media/dvb/ttpci/Makefile
@@ -17,5 +17,5 @@ obj-$(CONFIG_DVB_BUDGET_CI) += budget-ci.o
17obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-patch.o 17obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-patch.o
18obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o 18obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o
19 19
20ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ 20ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/
21ccflags-y += -Idrivers/media/common/tuners 21ccflags-y += -Idrivers/media/common/tuners
diff --git a/drivers/media/dvb/ttusb-budget/Makefile b/drivers/media/dvb/ttusb-budget/Makefile
index 8d6c4acb7f1d..c5abe78ae04f 100644
--- a/drivers/media/dvb/ttusb-budget/Makefile
+++ b/drivers/media/dvb/ttusb-budget/Makefile
@@ -1,3 +1,3 @@
1obj-$(CONFIG_DVB_TTUSB_BUDGET) += dvb-ttusb-budget.o 1obj-$(CONFIG_DVB_TTUSB_BUDGET) += dvb-ttusb-budget.o
2 2
3ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends 3ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends
diff --git a/drivers/media/dvb/ttusb-dec/Makefile b/drivers/media/dvb/ttusb-dec/Makefile
index ed28b5384d20..5352740d2353 100644
--- a/drivers/media/dvb/ttusb-dec/Makefile
+++ b/drivers/media/dvb/ttusb-dec/Makefile
@@ -1,3 +1,3 @@
1obj-$(CONFIG_DVB_TTUSB_DEC) += ttusb_dec.o ttusbdecfe.o 1obj-$(CONFIG_DVB_TTUSB_DEC) += ttusb_dec.o ttusbdecfe.o
2 2
3ccflags-y += -Idrivers/media/dvb/dvb-core/ 3ccflags-y += -Idrivers/media/dvb-core/
diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Makefile
index 7319c27e256b..f5036d1ec7c3 100644
--- a/drivers/media/v4l2-core/Makefile
+++ b/drivers/media/v4l2-core/Makefile
@@ -29,7 +29,7 @@ obj-$(CONFIG_VIDEOBUF2_VMALLOC) += videobuf2-vmalloc.o
29obj-$(CONFIG_VIDEOBUF2_DMA_CONTIG) += videobuf2-dma-contig.o 29obj-$(CONFIG_VIDEOBUF2_DMA_CONTIG) += videobuf2-dma-contig.o
30obj-$(CONFIG_VIDEOBUF2_DMA_SG) += videobuf2-dma-sg.o 30obj-$(CONFIG_VIDEOBUF2_DMA_SG) += videobuf2-dma-sg.o
31 31
32ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core 32ccflags-y += -I$(srctree)/drivers/media/dvb-core
33ccflags-y += -I$(srctree)/drivers/media/dvb/frontends 33ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
34ccflags-y += -I$(srctree)/drivers/media/common/tuners 34ccflags-y += -I$(srctree)/drivers/media/common/tuners
35 35
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 839e2c982376..9f4b063f03da 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -190,6 +190,6 @@ obj-y += davinci/
190 190
191obj-$(CONFIG_ARCH_OMAP) += omap/ 191obj-$(CONFIG_ARCH_OMAP) += omap/
192 192
193ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core 193ccflags-y += -I$(srctree)/drivers/media/dvb-core
194ccflags-y += -I$(srctree)/drivers/media/dvb/frontends 194ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
195ccflags-y += -I$(srctree)/drivers/media/common/tuners 195ccflags-y += -I$(srctree)/drivers/media/common/tuners
diff --git a/drivers/media/video/au0828/Makefile b/drivers/media/video/au0828/Makefile
index bd22223f8d9f..59d15b31f23f 100644
--- a/drivers/media/video/au0828/Makefile
+++ b/drivers/media/video/au0828/Makefile
@@ -3,7 +3,7 @@ au0828-objs := au0828-core.o au0828-i2c.o au0828-cards.o au0828-dvb.o au0828-vid
3obj-$(CONFIG_VIDEO_AU0828) += au0828.o 3obj-$(CONFIG_VIDEO_AU0828) += au0828.o
4 4
5ccflags-y += -Idrivers/media/common/tuners 5ccflags-y += -Idrivers/media/common/tuners
6ccflags-y += -Idrivers/media/dvb/dvb-core 6ccflags-y += -Idrivers/media/dvb-core
7ccflags-y += -Idrivers/media/dvb/frontends 7ccflags-y += -Idrivers/media/dvb/frontends
8 8
9ccflags-y += $(extra-cflags-y) $(extra-cflags-m) 9ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
diff --git a/drivers/media/video/bt8xx/Makefile b/drivers/media/video/bt8xx/Makefile
index 3f9a2b22d3d4..4cba4eff36d8 100644
--- a/drivers/media/video/bt8xx/Makefile
+++ b/drivers/media/video/bt8xx/Makefile
@@ -10,4 +10,4 @@ obj-$(CONFIG_VIDEO_BT848) += bttv.o
10 10
11ccflags-y += -Idrivers/media/video 11ccflags-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-core
diff --git a/drivers/media/video/cx18/Makefile b/drivers/media/video/cx18/Makefile
index a86bab5893ef..e0701e92f4ee 100644
--- a/drivers/media/video/cx18/Makefile
+++ b/drivers/media/video/cx18/Makefile
@@ -8,6 +8,6 @@ cx18-alsa-objs := cx18-alsa-main.o cx18-alsa-pcm.o
8obj-$(CONFIG_VIDEO_CX18) += cx18.o 8obj-$(CONFIG_VIDEO_CX18) += cx18.o
9obj-$(CONFIG_VIDEO_CX18_ALSA) += cx18-alsa.o 9obj-$(CONFIG_VIDEO_CX18_ALSA) += cx18-alsa.o
10 10
11ccflags-y += -Idrivers/media/dvb/dvb-core 11ccflags-y += -Idrivers/media/dvb-core
12ccflags-y += -Idrivers/media/dvb/frontends 12ccflags-y += -Idrivers/media/dvb/frontends
13ccflags-y += -Idrivers/media/common/tuners 13ccflags-y += -Idrivers/media/common/tuners
diff --git a/drivers/media/video/cx231xx/Makefile b/drivers/media/video/cx231xx/Makefile
index cb06b022e011..2151c3d1275b 100644
--- a/drivers/media/video/cx231xx/Makefile
+++ b/drivers/media/video/cx231xx/Makefile
@@ -10,6 +10,6 @@ obj-$(CONFIG_VIDEO_CX231XX_DVB) += cx231xx-dvb.o
10 10
11ccflags-y += -Idrivers/media/video 11ccflags-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-core
14ccflags-y += -Idrivers/media/dvb/frontends 14ccflags-y += -Idrivers/media/dvb/frontends
15 15
diff --git a/drivers/media/video/cx23885/Makefile b/drivers/media/video/cx23885/Makefile
index f81f2796a0f9..3608f327a4b0 100644
--- a/drivers/media/video/cx23885/Makefile
+++ b/drivers/media/video/cx23885/Makefile
@@ -9,7 +9,7 @@ obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o
9 9
10ccflags-y += -Idrivers/media/video 10ccflags-y += -Idrivers/media/video
11ccflags-y += -Idrivers/media/common/tuners 11ccflags-y += -Idrivers/media/common/tuners
12ccflags-y += -Idrivers/media/dvb/dvb-core 12ccflags-y += -Idrivers/media/dvb-core
13ccflags-y += -Idrivers/media/dvb/frontends 13ccflags-y += -Idrivers/media/dvb/frontends
14 14
15ccflags-y += $(extra-cflags-y) $(extra-cflags-m) 15ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
diff --git a/drivers/media/video/cx25821/Makefile b/drivers/media/video/cx25821/Makefile
index aedde18c68f9..1628aa3b13fb 100644
--- a/drivers/media/video/cx25821/Makefile
+++ b/drivers/media/video/cx25821/Makefile
@@ -9,5 +9,5 @@ obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o
9 9
10ccflags-y := -Idrivers/media/video 10ccflags-y := -Idrivers/media/video
11ccflags-y += -Idrivers/media/common/tuners 11ccflags-y += -Idrivers/media/common/tuners
12ccflags-y += -Idrivers/media/dvb/dvb-core 12ccflags-y += -Idrivers/media/dvb-core
13ccflags-y += -Idrivers/media/dvb/frontends 13ccflags-y += -Idrivers/media/dvb/frontends
diff --git a/drivers/media/video/cx88/Makefile b/drivers/media/video/cx88/Makefile
index c1a2785ba243..1902366f9b81 100644
--- a/drivers/media/video/cx88/Makefile
+++ b/drivers/media/video/cx88/Makefile
@@ -12,5 +12,5 @@ obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o
12 12
13ccflags-y += -Idrivers/media/video 13ccflags-y += -Idrivers/media/video
14ccflags-y += -Idrivers/media/common/tuners 14ccflags-y += -Idrivers/media/common/tuners
15ccflags-y += -Idrivers/media/dvb/dvb-core 15ccflags-y += -Idrivers/media/dvb-core
16ccflags-y += -Idrivers/media/dvb/frontends 16ccflags-y += -Idrivers/media/dvb/frontends
diff --git a/drivers/media/video/em28xx/Makefile b/drivers/media/video/em28xx/Makefile
index c8b338d4be05..b00298a02d5d 100644
--- a/drivers/media/video/em28xx/Makefile
+++ b/drivers/media/video/em28xx/Makefile
@@ -11,5 +11,5 @@ obj-$(CONFIG_VIDEO_EM28XX_RC) += em28xx-rc.o
11 11
12ccflags-y += -Idrivers/media/video 12ccflags-y += -Idrivers/media/video
13ccflags-y += -Idrivers/media/common/tuners 13ccflags-y += -Idrivers/media/common/tuners
14ccflags-y += -Idrivers/media/dvb/dvb-core 14ccflags-y += -Idrivers/media/dvb-core
15ccflags-y += -Idrivers/media/dvb/frontends 15ccflags-y += -Idrivers/media/dvb/frontends
diff --git a/drivers/media/video/ivtv/Makefile b/drivers/media/video/ivtv/Makefile
index 77de8a45b46f..c54cfe12e202 100644
--- a/drivers/media/video/ivtv/Makefile
+++ b/drivers/media/video/ivtv/Makefile
@@ -9,6 +9,6 @@ obj-$(CONFIG_VIDEO_FB_IVTV) += ivtvfb.o
9 9
10ccflags-y += -I$(srctree)/drivers/media/video 10ccflags-y += -I$(srctree)/drivers/media/video
11ccflags-y += -I$(srctree)/drivers/media/common/tuners 11ccflags-y += -I$(srctree)/drivers/media/common/tuners
12ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core 12ccflags-y += -I$(srctree)/drivers/media/dvb-core
13ccflags-y += -I$(srctree)/drivers/media/dvb/frontends 13ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
14 14
diff --git a/drivers/media/video/pvrusb2/Makefile b/drivers/media/video/pvrusb2/Makefile
index c17f37d964ad..298a9306e767 100644
--- a/drivers/media/video/pvrusb2/Makefile
+++ b/drivers/media/video/pvrusb2/Makefile
@@ -18,5 +18,5 @@ obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o
18 18
19ccflags-y += -Idrivers/media/video 19ccflags-y += -Idrivers/media/video
20ccflags-y += -Idrivers/media/common/tuners 20ccflags-y += -Idrivers/media/common/tuners
21ccflags-y += -Idrivers/media/dvb/dvb-core 21ccflags-y += -Idrivers/media/dvb-core
22ccflags-y += -Idrivers/media/dvb/frontends 22ccflags-y += -Idrivers/media/dvb/frontends
diff --git a/drivers/media/video/saa7134/Makefile b/drivers/media/video/saa7134/Makefile
index da3899329f52..364891fb8e35 100644
--- a/drivers/media/video/saa7134/Makefile
+++ b/drivers/media/video/saa7134/Makefile
@@ -12,5 +12,5 @@ obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
12 12
13ccflags-y += -I$(srctree)/drivers/media/video 13ccflags-y += -I$(srctree)/drivers/media/video
14ccflags-y += -I$(srctree)/drivers/media/common/tuners 14ccflags-y += -I$(srctree)/drivers/media/common/tuners
15ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core 15ccflags-y += -I$(srctree)/drivers/media/dvb-core
16ccflags-y += -I$(srctree)/drivers/media/dvb/frontends 16ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
diff --git a/drivers/media/video/saa7164/Makefile b/drivers/media/video/saa7164/Makefile
index 068443af30c8..50e19f943e78 100644
--- a/drivers/media/video/saa7164/Makefile
+++ b/drivers/media/video/saa7164/Makefile
@@ -6,7 +6,7 @@ obj-$(CONFIG_VIDEO_SAA7164) += saa7164.o
6 6
7ccflags-y += -I$(srctree)/drivers/media/video 7ccflags-y += -I$(srctree)/drivers/media/video
8ccflags-y += -I$(srctree)/drivers/media/common/tuners 8ccflags-y += -I$(srctree)/drivers/media/common/tuners
9ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core 9ccflags-y += -I$(srctree)/drivers/media/dvb-core
10ccflags-y += -I$(srctree)/drivers/media/dvb/frontends 10ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
11 11
12ccflags-y += $(extra-cflags-y) $(extra-cflags-m) 12ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
diff --git a/drivers/media/video/tlg2300/Makefile b/drivers/media/video/tlg2300/Makefile
index ea09b9af2d30..f0f4f6a22180 100644
--- a/drivers/media/video/tlg2300/Makefile
+++ b/drivers/media/video/tlg2300/Makefile
@@ -4,6 +4,6 @@ obj-$(CONFIG_VIDEO_TLG2300) += poseidon.o
4 4
5ccflags-y += -Idrivers/media/video 5ccflags-y += -Idrivers/media/video
6ccflags-y += -Idrivers/media/common/tuners 6ccflags-y += -Idrivers/media/common/tuners
7ccflags-y += -Idrivers/media/dvb/dvb-core 7ccflags-y += -Idrivers/media/dvb-core
8ccflags-y += -Idrivers/media/dvb/frontends 8ccflags-y += -Idrivers/media/dvb/frontends
9 9
diff --git a/drivers/media/video/tm6000/Makefile b/drivers/media/video/tm6000/Makefile
index 395515b4a888..b797a8a8bae4 100644
--- a/drivers/media/video/tm6000/Makefile
+++ b/drivers/media/video/tm6000/Makefile
@@ -11,5 +11,5 @@ obj-$(CONFIG_VIDEO_TM6000_DVB) += tm6000-dvb.o
11 11
12ccflags-y := -Idrivers/media/video 12ccflags-y := -Idrivers/media/video
13ccflags-y += -Idrivers/media/common/tuners 13ccflags-y += -Idrivers/media/common/tuners
14ccflags-y += -Idrivers/media/dvb/dvb-core 14ccflags-y += -Idrivers/media/dvb-core
15ccflags-y += -Idrivers/media/dvb/frontends 15ccflags-y += -Idrivers/media/dvb/frontends
diff --git a/drivers/staging/media/as102/Makefile b/drivers/staging/media/as102/Makefile
index 1bca43e847c7..d8dfb757f1e2 100644
--- a/drivers/staging/media/as102/Makefile
+++ b/drivers/staging/media/as102/Makefile
@@ -3,4 +3,4 @@ dvb-as102-objs := as102_drv.o as102_fw.o as10x_cmd.o as10x_cmd_stream.o \
3 3
4obj-$(CONFIG_DVB_AS102) += dvb-as102.o 4obj-$(CONFIG_DVB_AS102) += dvb-as102.o
5 5
6EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 6EXTRA_CFLAGS += -Idrivers/media/dvb-core
diff --git a/drivers/staging/media/cxd2099/Makefile b/drivers/staging/media/cxd2099/Makefile
index 64cfc77be357..b0833fa361be 100644
--- a/drivers/staging/media/cxd2099/Makefile
+++ b/drivers/staging/media/cxd2099/Makefile
@@ -1,5 +1,5 @@
1obj-$(CONFIG_DVB_CXD2099) += cxd2099.o 1obj-$(CONFIG_DVB_CXD2099) += cxd2099.o
2 2
3ccflags-y += -Idrivers/media/dvb/dvb-core/ 3ccflags-y += -Idrivers/media/dvb-core/
4ccflags-y += -Idrivers/media/dvb/frontends/ 4ccflags-y += -Idrivers/media/dvb/frontends/
5ccflags-y += -Idrivers/media/common/tuners/ 5ccflags-y += -Idrivers/media/common/tuners/
diff --git a/drivers/staging/media/go7007/Makefile b/drivers/staging/media/go7007/Makefile
index 6ee837c56706..eea1e72dfa09 100644
--- a/drivers/staging/media/go7007/Makefile
+++ b/drivers/staging/media/go7007/Makefile
@@ -27,4 +27,4 @@ s2250-y := s2250-board.o
27ccflags-$(CONFIG_VIDEO_GO7007_USB_S2250_BOARD:m=y) += -Idrivers/media/dvb/dvb-usb 27ccflags-$(CONFIG_VIDEO_GO7007_USB_S2250_BOARD:m=y) += -Idrivers/media/dvb/dvb-usb
28 28
29ccflags-y += -Idrivers/media/dvb/frontends 29ccflags-y += -Idrivers/media/dvb/frontends
30ccflags-y += -Idrivers/media/dvb/dvb-core 30ccflags-y += -Idrivers/media/dvb-core