From 14fbf8de9703a84a9c2809cf05cdc88e57c72b85 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 5 Aug 2012 19:50:15 -0300 Subject: [PATCH] --- yaml --- r: 330667 b: refs/heads/master c: ccc0e3483c2447fd14d4fb9ba2a77da628322815 h: refs/heads/master i: 330665: 30549796c0207a8e6e6734f7a37190684129dbb4 330663: e9263905c7d200d555878baa8a18b5bf6f0d6d0e v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/{dvb-usb => dvb-core}/dvb-usb-ids.h | 0 trunk/drivers/media/dvb/dvb-usb-v2/dvb_usb.h | 2 +- trunk/drivers/media/dvb/dvb-usb/Makefile | 1 - trunk/drivers/media/video/cx231xx/Makefile | 1 - 5 files changed, 2 insertions(+), 4 deletions(-) rename trunk/drivers/media/dvb/{dvb-usb => dvb-core}/dvb-usb-ids.h (100%) diff --git a/[refs] b/[refs] index 10668a22dd5e..f94c810cbbf4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 355b4b2b5e83986132c77326e2b97780480b8d69 +refs/heads/master: ccc0e3483c2447fd14d4fb9ba2a77da628322815 diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/trunk/drivers/media/dvb/dvb-core/dvb-usb-ids.h similarity index 100% rename from trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h rename to trunk/drivers/media/dvb/dvb-core/dvb-usb-ids.h diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/dvb_usb.h b/trunk/drivers/media/dvb/dvb-usb-v2/dvb_usb.h index 4db591be646c..773817b5fe06 100644 --- a/trunk/drivers/media/dvb/dvb-usb-v2/dvb_usb.h +++ b/trunk/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/trunk/drivers/media/dvb/dvb-usb/Makefile b/trunk/drivers/media/dvb/dvb-usb/Makefile index 29fa0f0637e5..4b70599b38d9 100644 --- a/trunk/drivers/media/dvb/dvb-usb/Makefile +++ b/trunk/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/trunk/drivers/media/video/cx231xx/Makefile b/trunk/drivers/media/video/cx231xx/Makefile index b3348975c7c2..cb06b022e011 100644 --- a/trunk/drivers/media/video/cx231xx/Makefile +++ b/trunk/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