diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-05 19:50:15 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-05 19:53:26 -0300 |
| commit | ccc0e3483c2447fd14d4fb9ba2a77da628322815 (patch) | |
| tree | a3fdba5ca8e3ee2bbd001683135d0ef21f419a06 | |
| parent | 355b4b2b5e83986132c77326e2b97780480b8d69 (diff) | |
| download | linux-3.10-ccc0e3483c2447fd14d4fb9ba2a77da628322815.tar.gz linux-3.10-ccc0e3483c2447fd14d4fb9ba2a77da628322815.tar.bz2 linux-3.10-ccc0e3483c2447fd14d4fb9ba2a77da628322815.zip | |
[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>
| -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 26c44818a5a..26c44818a5a 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 4db591be646..773817b5fe0 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 @@ #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 index 29fa0f0637e..4b70599b38d 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/ # 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 index b3348975c7c..cb06b022e01 100644 --- 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 |