diff options
| author | Antti Palosaari <crope@iki.fi> | 2014-11-12 00:01:44 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-11-14 17:22:34 -0200 |
| commit | c867b265b15c2703fe07adcce064a2e3ba77ed13 (patch) | |
| tree | 9e182ae990e01bb0b90e9dc237e0ef2971352c2d /drivers | |
| parent | 5048907076ea8b31aa15a3ec7a6ce9c341eb77ce (diff) | |
| download | op-kernel-dev-c867b265b15c2703fe07adcce064a2e3ba77ed13.zip op-kernel-dev-c867b265b15c2703fe07adcce064a2e3ba77ed13.tar.gz | |
[media] mn88472: move to staging
It is not ready enough to be released on mainline.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/dvb-frontends/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/media/dvb-frontends/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/media/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/media/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/media/mn88472/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/staging/media/mn88472/Makefile | 5 | ||||
| -rw-r--r-- | drivers/staging/media/mn88472/mn88472.c (renamed from drivers/media/dvb-frontends/mn88472.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/mn88472/mn88472_priv.h (renamed from drivers/media/dvb-frontends/mn88472_priv.h) | 0 |
8 files changed, 15 insertions, 9 deletions
diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig index 207843e..6c75418 100644 --- a/drivers/media/dvb-frontends/Kconfig +++ b/drivers/media/dvb-frontends/Kconfig @@ -441,14 +441,6 @@ config DVB_CXD2820R help Say Y when you want to support this frontend. -config DVB_MN88472 - tristate "Panasonic MN88472" - depends on DVB_CORE && I2C - select REGMAP_I2C - default m if !MEDIA_SUBDRV_AUTOSELECT - help - Say Y when you want to support this frontend. - config DVB_RTL2830 tristate "Realtek RTL2830 DVB-T" depends on DVB_CORE && I2C diff --git a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile index b82225f6..ba59df6 100644 --- a/drivers/media/dvb-frontends/Makefile +++ b/drivers/media/dvb-frontends/Makefile @@ -103,7 +103,6 @@ obj-$(CONFIG_DVB_MB86A20S) += mb86a20s.o obj-$(CONFIG_DVB_IX2505V) += ix2505v.o obj-$(CONFIG_DVB_STV0367) += stv0367.o obj-$(CONFIG_DVB_CXD2820R) += cxd2820r.o -obj-$(CONFIG_DVB_MN88472) += mn88472.o obj-$(CONFIG_DVB_DRXK) += drxk.o obj-$(CONFIG_DVB_TDA18271C2DD) += tda18271c2dd.o obj-$(CONFIG_DVB_SI2165) += si2165.o diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index 655cf50..c2e675a 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -27,6 +27,8 @@ source "drivers/staging/media/davinci_vpfe/Kconfig" source "drivers/staging/media/dt3155v4l/Kconfig" +source "drivers/staging/media/mn88472/Kconfig" + source "drivers/staging/media/omap24xx/Kconfig" source "drivers/staging/media/omap4iss/Kconfig" diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile index 6dbe578..e174c57 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -6,4 +6,5 @@ obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/ obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/ obj-$(CONFIG_VIDEO_OMAP2) += omap24xx/ obj-$(CONFIG_VIDEO_TCM825X) += omap24xx/ +obj-$(CONFIG_DVB_MN88472) += mn88472/ diff --git a/drivers/staging/media/mn88472/Kconfig b/drivers/staging/media/mn88472/Kconfig new file mode 100644 index 0000000..a85c90a --- /dev/null +++ b/drivers/staging/media/mn88472/Kconfig @@ -0,0 +1,7 @@ +config DVB_MN88472 + tristate "Panasonic MN88472" + depends on DVB_CORE && I2C + select REGMAP_I2C + default m if !MEDIA_SUBDRV_AUTOSELECT + help + Say Y when you want to support this frontend. diff --git a/drivers/staging/media/mn88472/Makefile b/drivers/staging/media/mn88472/Makefile new file mode 100644 index 0000000..5987b7e --- /dev/null +++ b/drivers/staging/media/mn88472/Makefile @@ -0,0 +1,5 @@ +obj-$(CONFIG_DVB_MN88472) += mn88472.o + +ccflags-y += -Idrivers/media/dvb-core/ +ccflags-y += -Idrivers/media/dvb-frontends/ +ccflags-y += -Idrivers/media/tuners/ diff --git a/drivers/media/dvb-frontends/mn88472.c b/drivers/staging/media/mn88472/mn88472.c index 52de8f8..52de8f8 100644 --- a/drivers/media/dvb-frontends/mn88472.c +++ b/drivers/staging/media/mn88472/mn88472.c diff --git a/drivers/media/dvb-frontends/mn88472_priv.h b/drivers/staging/media/mn88472/mn88472_priv.h index 1095949..1095949 100644 --- a/drivers/media/dvb-frontends/mn88472_priv.h +++ b/drivers/staging/media/mn88472/mn88472_priv.h |
