diff options
| author | Antti Palosaari <crope@iki.fi> | 2014-07-12 14:53:22 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-21 20:30:52 -0300 |
| commit | 150dcf5575a937d88ef137f8cddc4f8bd7bb9c8c (patch) | |
| tree | ce6ea184267e906c19697dcdc706368c02d97d82 | |
| parent | d9d889d3249a6fee8ba61d0ea0e6f0a8e857c832 (diff) | |
| download | op-kernel-dev-150dcf5575a937d88ef137f8cddc4f8bd7bb9c8c.zip op-kernel-dev-150dcf5575a937d88ef137f8cddc4f8bd7bb9c8c.tar.gz | |
msi001: move out of staging
Move MSi001 driver from staging to drivers/media/tuners/.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
| -rw-r--r-- | drivers/media/tuners/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/media/tuners/Makefile | 1 | ||||
| -rw-r--r-- | drivers/media/tuners/msi001.c (renamed from drivers/staging/media/msi3101/msi001.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/msi3101/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/staging/media/msi3101/Makefile | 1 |
5 files changed, 7 insertions, 4 deletions
diff --git a/drivers/media/tuners/Kconfig b/drivers/media/tuners/Kconfig index 22b6b8b..906461d 100644 --- a/drivers/media/tuners/Kconfig +++ b/drivers/media/tuners/Kconfig @@ -71,6 +71,12 @@ config MEDIA_TUNER_TEA5767 help Say Y here to include support for the Philips TEA5767 radio tuner. +config MEDIA_TUNER_MSI001 + tristate "Mirics MSi001" + depends on MEDIA_SUPPORT && SPI && VIDEO_V4L2 + help + Mirics MSi001 silicon tuner driver. + config MEDIA_TUNER_MT20XX tristate "Microtune 2032 / 2050 tuners" depends on MEDIA_SUPPORT && I2C diff --git a/drivers/media/tuners/Makefile b/drivers/media/tuners/Makefile index a6ff0c6..5591699 100644 --- a/drivers/media/tuners/Makefile +++ b/drivers/media/tuners/Makefile @@ -17,6 +17,7 @@ obj-$(CONFIG_MEDIA_TUNER_TDA827X) += tda827x.o obj-$(CONFIG_MEDIA_TUNER_TDA18271) += tda18271.o obj-$(CONFIG_MEDIA_TUNER_XC5000) += xc5000.o obj-$(CONFIG_MEDIA_TUNER_XC4000) += xc4000.o +obj-$(CONFIG_MEDIA_TUNER_MSI001) += msi001.o obj-$(CONFIG_MEDIA_TUNER_MT2060) += mt2060.o obj-$(CONFIG_MEDIA_TUNER_MT2063) += mt2063.o obj-$(CONFIG_MEDIA_TUNER_MT2266) += mt2266.o diff --git a/drivers/staging/media/msi3101/msi001.c b/drivers/media/tuners/msi001.c index ee99e37..ee99e37 100644 --- a/drivers/staging/media/msi3101/msi001.c +++ b/drivers/media/tuners/msi001.c diff --git a/drivers/staging/media/msi3101/Kconfig b/drivers/staging/media/msi3101/Kconfig index de0b3bb..399dbbb 100644 --- a/drivers/staging/media/msi3101/Kconfig +++ b/drivers/staging/media/msi3101/Kconfig @@ -5,6 +5,3 @@ config USB_MSI3101 select VIDEOBUF2_VMALLOC select MEDIA_TUNER_MSI001 -config MEDIA_TUNER_MSI001 - tristate "Mirics MSi001" - depends on VIDEO_V4L2 && SPI diff --git a/drivers/staging/media/msi3101/Makefile b/drivers/staging/media/msi3101/Makefile index daf4f58..3730654 100644 --- a/drivers/staging/media/msi3101/Makefile +++ b/drivers/staging/media/msi3101/Makefile @@ -1,2 +1 @@ obj-$(CONFIG_USB_MSI3101) += sdr-msi3101.o -obj-$(CONFIG_MEDIA_TUNER_MSI001) += msi001.o |
