diff options
author | Antti Palosaari <crope@iki.fi> | 2014-11-11 22:51:44 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-11-14 14:26:05 -0500 |
commit | 4f80d858818b70a8a4864f3350f54dbf6422ad7b (patch) | |
tree | b43cdc8fbc01135887fad379681277cdd78dfcc8 | |
parent | 97de6e89d82ad9168a27b901acc39d45fb5adfcd (diff) |
[media] mn88473: 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>
-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/mn88473/Kconfig | 7 | ||||
-rw-r--r-- | drivers/staging/media/mn88473/Makefile | 5 | ||||
-rw-r--r-- | drivers/staging/media/mn88473/mn88473.c (renamed from drivers/media/dvb-frontends/mn88473.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/mn88473/mn88473_priv.h (renamed from drivers/media/dvb-frontends/mn88473_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 e60614b476a1..6c75418222e2 100644 --- a/drivers/media/dvb-frontends/Kconfig +++ b/drivers/media/dvb-frontends/Kconfig | |||
@@ -471,14 +471,6 @@ config DVB_SI2168 | |||
471 | help | 471 | help |
472 | Say Y when you want to support this frontend. | 472 | Say Y when you want to support this frontend. |
473 | 473 | ||
474 | config DVB_MN88473 | ||
475 | tristate "Panasonic MN88473" | ||
476 | depends on DVB_CORE && I2C | ||
477 | select REGMAP_I2C | ||
478 | default m if !MEDIA_SUBDRV_AUTOSELECT | ||
479 | help | ||
480 | Say Y when you want to support this frontend. | ||
481 | |||
482 | config DVB_AS102_FE | 474 | config DVB_AS102_FE |
483 | tristate | 475 | tristate |
484 | depends on DVB_CORE | 476 | depends on DVB_CORE |
diff --git a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile index 8be6eb0d440d..ba59df63d050 100644 --- a/drivers/media/dvb-frontends/Makefile +++ b/drivers/media/dvb-frontends/Makefile | |||
@@ -113,7 +113,6 @@ obj-$(CONFIG_DVB_RTL2830) += rtl2830.o | |||
113 | obj-$(CONFIG_DVB_RTL2832) += rtl2832.o | 113 | obj-$(CONFIG_DVB_RTL2832) += rtl2832.o |
114 | obj-$(CONFIG_DVB_RTL2832_SDR) += rtl2832_sdr.o | 114 | obj-$(CONFIG_DVB_RTL2832_SDR) += rtl2832_sdr.o |
115 | obj-$(CONFIG_DVB_M88RS2000) += m88rs2000.o | 115 | obj-$(CONFIG_DVB_M88RS2000) += m88rs2000.o |
116 | obj-$(CONFIG_DVB_MN88473) += mn88473.o | ||
117 | obj-$(CONFIG_DVB_AF9033) += af9033.o | 116 | obj-$(CONFIG_DVB_AF9033) += af9033.o |
118 | obj-$(CONFIG_DVB_AS102_FE) += as102_fe.o | 117 | obj-$(CONFIG_DVB_AS102_FE) += as102_fe.o |
119 | obj-$(CONFIG_DVB_TC90522) += tc90522.o | 118 | obj-$(CONFIG_DVB_TC90522) += tc90522.o |
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index c2e675aa22c5..273c44c41a33 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig | |||
@@ -29,6 +29,8 @@ source "drivers/staging/media/dt3155v4l/Kconfig" | |||
29 | 29 | ||
30 | source "drivers/staging/media/mn88472/Kconfig" | 30 | source "drivers/staging/media/mn88472/Kconfig" |
31 | 31 | ||
32 | source "drivers/staging/media/mn88473/Kconfig" | ||
33 | |||
32 | source "drivers/staging/media/omap24xx/Kconfig" | 34 | source "drivers/staging/media/omap24xx/Kconfig" |
33 | 35 | ||
34 | source "drivers/staging/media/omap4iss/Kconfig" | 36 | source "drivers/staging/media/omap4iss/Kconfig" |
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile index e174c57331e1..bb2180083b22 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile | |||
@@ -7,4 +7,5 @@ obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/ | |||
7 | obj-$(CONFIG_VIDEO_OMAP2) += omap24xx/ | 7 | obj-$(CONFIG_VIDEO_OMAP2) += omap24xx/ |
8 | obj-$(CONFIG_VIDEO_TCM825X) += omap24xx/ | 8 | obj-$(CONFIG_VIDEO_TCM825X) += omap24xx/ |
9 | obj-$(CONFIG_DVB_MN88472) += mn88472/ | 9 | obj-$(CONFIG_DVB_MN88472) += mn88472/ |
10 | obj-$(CONFIG_DVB_MN88473) += mn88473/ | ||
10 | 11 | ||
diff --git a/drivers/staging/media/mn88473/Kconfig b/drivers/staging/media/mn88473/Kconfig new file mode 100644 index 000000000000..6c9ebf51c2c7 --- /dev/null +++ b/drivers/staging/media/mn88473/Kconfig | |||
@@ -0,0 +1,7 @@ | |||
1 | config DVB_MN88473 | ||
2 | tristate "Panasonic MN88473" | ||
3 | depends on DVB_CORE && I2C | ||
4 | select REGMAP_I2C | ||
5 | default m if !MEDIA_SUBDRV_AUTOSELECT | ||
6 | help | ||
7 | Say Y when you want to support this frontend. | ||
diff --git a/drivers/staging/media/mn88473/Makefile b/drivers/staging/media/mn88473/Makefile new file mode 100644 index 000000000000..fac55410ce55 --- /dev/null +++ b/drivers/staging/media/mn88473/Makefile | |||
@@ -0,0 +1,5 @@ | |||
1 | obj-$(CONFIG_DVB_MN88473) += mn88473.o | ||
2 | |||
3 | ccflags-y += -Idrivers/media/dvb-core/ | ||
4 | ccflags-y += -Idrivers/media/dvb-frontends/ | ||
5 | ccflags-y += -Idrivers/media/tuners/ | ||
diff --git a/drivers/media/dvb-frontends/mn88473.c b/drivers/staging/media/mn88473/mn88473.c index 165933540b34..165933540b34 100644 --- a/drivers/media/dvb-frontends/mn88473.c +++ b/drivers/staging/media/mn88473/mn88473.c | |||
diff --git a/drivers/media/dvb-frontends/mn88473_priv.h b/drivers/staging/media/mn88473/mn88473_priv.h index 78af112fb41d..78af112fb41d 100644 --- a/drivers/media/dvb-frontends/mn88473_priv.h +++ b/drivers/staging/media/mn88473/mn88473_priv.h | |||