[media] rtl28xxu: do not hard depend on staging SDR module
RTL2832 SDR extension module is currently on staging. SDR module headers were included from staging causing direct dependency staging directory. As a solution, add needed headers to main driver. Motivation of that change comes from Luis / driver backports project. Reported-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> Cc: backports@vger.kernel.org Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Родитель
277a163c83
Коммит
1fd10f98d9
|
@ -41,4 +41,3 @@ ccflags-y += -I$(srctree)/drivers/media/dvb-core
|
||||||
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
|
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
|
||||||
ccflags-y += -I$(srctree)/drivers/media/tuners
|
ccflags-y += -I$(srctree)/drivers/media/tuners
|
||||||
ccflags-y += -I$(srctree)/drivers/media/common
|
ccflags-y += -I$(srctree)/drivers/media/common
|
||||||
ccflags-y += -I$(srctree)/drivers/staging/media/rtl2832u_sdr
|
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
|
|
||||||
#include "rtl2830.h"
|
#include "rtl2830.h"
|
||||||
#include "rtl2832.h"
|
#include "rtl2832.h"
|
||||||
#include "rtl2832_sdr.h"
|
|
||||||
|
|
||||||
#include "qt1010.h"
|
#include "qt1010.h"
|
||||||
#include "mt2060.h"
|
#include "mt2060.h"
|
||||||
|
@ -36,6 +35,26 @@
|
||||||
#include "tua9001.h"
|
#include "tua9001.h"
|
||||||
#include "r820t.h"
|
#include "r820t.h"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* RTL2832_SDR module is in staging. That logic is added in order to avoid any
|
||||||
|
* hard dependency to drivers/staging/ directory as we want compile mainline
|
||||||
|
* driver even whole staging directory is missing.
|
||||||
|
*/
|
||||||
|
#include <media/v4l2-subdev.h>
|
||||||
|
|
||||||
|
#if IS_ENABLED(CONFIG_DVB_RTL2832_SDR)
|
||||||
|
struct dvb_frontend *rtl2832_sdr_attach(struct dvb_frontend *fe,
|
||||||
|
struct i2c_adapter *i2c, const struct rtl2832_config *cfg,
|
||||||
|
struct v4l2_subdev *sd);
|
||||||
|
#else
|
||||||
|
static inline struct dvb_frontend *rtl2832_sdr_attach(struct dvb_frontend *fe,
|
||||||
|
struct i2c_adapter *i2c, const struct rtl2832_config *cfg,
|
||||||
|
struct v4l2_subdev *sd)
|
||||||
|
{
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static int rtl28xxu_disable_rc;
|
static int rtl28xxu_disable_rc;
|
||||||
module_param_named(disable_rc, rtl28xxu_disable_rc, int, 0644);
|
module_param_named(disable_rc, rtl28xxu_disable_rc, int, 0644);
|
||||||
MODULE_PARM_DESC(disable_rc, "disable RTL2832U remote controller");
|
MODULE_PARM_DESC(disable_rc, "disable RTL2832U remote controller");
|
||||||
|
|
Загрузка…
Ссылка в новой задаче