diff options
-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.h | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/Makefile | 1 | ||||
-rw-r--r-- | drivers/media/video/cx231xx/Makefile | 1 |
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 |
93 | ccflags-y += -I$(srctree)/drivers/media/common/tuners | 93 | ccflags-y += -I$(srctree)/drivers/media/common/tuners |
94 | ccflags-y += -I$(srctree)/drivers/media/dvb/ttpci | 94 | ccflags-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 | |||
12 | ccflags-y += -Idrivers/media/common/tuners | 12 | ccflags-y += -Idrivers/media/common/tuners |
13 | ccflags-y += -Idrivers/media/dvb/dvb-core | 13 | ccflags-y += -Idrivers/media/dvb/dvb-core |
14 | ccflags-y += -Idrivers/media/dvb/frontends | 14 | ccflags-y += -Idrivers/media/dvb/frontends |
15 | ccflags-y += -Idrivers/media/dvb/dvb-usb | ||
16 | 15 | ||