diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2023-02-01 13:21:36 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2023-02-09 09:22:36 +0100 |
| commit | 39d08ab979b7995d22dd6b3ce74d3179f02847a1 (patch) | |
| tree | d0ab3d2b9ce69e8b7b7f9a3120b0f7a7858f3e19 /drivers/staging/media/av7110 | |
| parent | 0fcb867718519060c90afea2d9af0a7cc1c3bd36 (diff) | |
| download | linux-39d08ab979b7995d22dd6b3ce74d3179f02847a1.tar.gz linux-39d08ab979b7995d22dd6b3ce74d3179f02847a1.tar.bz2 linux-39d08ab979b7995d22dd6b3ce74d3179f02847a1.zip | |
media: Revert "media: saa7146: deprecate hexium_gemini/orion, mxb and ttpci"
This reverts commit e33fdb5a02490059e2f48ced2c038c8a46c6476d.
The saa7146-based devices are still in use, esp. for DVB. So move
these drivers back to mainline.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/staging/media/av7110')
| -rw-r--r-- | drivers/staging/media/av7110/Makefile | 3 | ||||
| -rw-r--r-- | drivers/staging/media/av7110/av7110.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/media/av7110/Makefile b/drivers/staging/media/av7110/Makefile index c04cd0a59109..307b267598ea 100644 --- a/drivers/staging/media/av7110/Makefile +++ b/drivers/staging/media/av7110/Makefile @@ -18,6 +18,5 @@ obj-$(CONFIG_DVB_SP8870) += sp8870.o ccflags-y += -I $(srctree)/drivers/media/dvb-frontends ccflags-y += -I $(srctree)/drivers/media/tuners +ccflags-y += -I $(srctree)/drivers/media/pci/ttpci ccflags-y += -I $(srctree)/drivers/media/common -ccflags-y += -I $(srctree)/drivers/staging/media/deprecated/saa7146/ttpci -ccflags-y += -I $(srctree)/drivers/staging/media/deprecated/saa7146/common diff --git a/drivers/staging/media/av7110/av7110.h b/drivers/staging/media/av7110/av7110.h index 9fde69b38f1c..809d938ae166 100644 --- a/drivers/staging/media/av7110/av7110.h +++ b/drivers/staging/media/av7110/av7110.h @@ -33,7 +33,7 @@ #include "stv0297.h" #include "l64781.h" -#include "saa7146_vv.h" +#include <media/drv-intf/saa7146_vv.h> #define ANALOG_TUNER_VES1820 1 |