diff options
| -rw-r--r-- | drivers/media/usb/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/media/usb/Makefile | 1 | ||||
| -rw-r--r-- | drivers/media/usb/msi2500/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/media/usb/msi2500/Makefile | 1 | ||||
| -rw-r--r-- | drivers/media/usb/msi2500/msi2500.c (renamed from drivers/staging/media/msi3101/sdr-msi3101.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/media/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/media/msi3101/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/staging/media/msi3101/Makefile | 1 |
9 files changed, 8 insertions, 11 deletions
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig index 38b6fe108fcf..fa67519abda2 100644 --- a/drivers/media/usb/Kconfig +++ b/drivers/media/usb/Kconfig @@ -54,6 +54,7 @@ endif if MEDIA_SDR_SUPPORT comment "Software defined radio USB devices" +source "drivers/media/usb/msi2500/Kconfig" source "drivers/media/usb/airspy/Kconfig" endif diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile index 05d69c282e1f..712a6b1e8882 100644 --- a/drivers/media/usb/Makefile +++ b/drivers/media/usb/Makefile @@ -9,6 +9,7 @@ obj-y += zr364xx/ stkwebcam/ s2255/ obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/ obj-$(CONFIG_USB_GSPCA) += gspca/ obj-$(CONFIG_USB_PWC) += pwc/ +obj-$(CONFIG_USB_MSI2500) += msi2500/ obj-$(CONFIG_USB_AIRSPY) += airspy/ obj-$(CONFIG_VIDEO_CPIA2) += cpia2/ obj-$(CONFIG_VIDEO_AU0828) += au0828/ diff --git a/drivers/media/usb/msi2500/Kconfig b/drivers/media/usb/msi2500/Kconfig new file mode 100644 index 000000000000..9eff8a76ff0e --- /dev/null +++ b/drivers/media/usb/msi2500/Kconfig @@ -0,0 +1,5 @@ +config USB_MSI2500 + tristate "Mirics MSi2500" + depends on VIDEO_V4L2 && SPI + select VIDEOBUF2_VMALLOC + select MEDIA_TUNER_MSI001 diff --git a/drivers/media/usb/msi2500/Makefile b/drivers/media/usb/msi2500/Makefile new file mode 100644 index 000000000000..b3bc2e53707f --- /dev/null +++ b/drivers/media/usb/msi2500/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_USB_MSI2500) += msi2500.o diff --git a/drivers/staging/media/msi3101/sdr-msi3101.c b/drivers/media/usb/msi2500/msi2500.c index 53aca380b288..53aca380b288 100644 --- a/drivers/staging/media/msi3101/sdr-msi3101.c +++ b/drivers/media/usb/msi2500/msi2500.c diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index a326d5d95ca8..e91c538d3d0d 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -31,8 +31,6 @@ source "drivers/staging/media/dt3155v4l/Kconfig" source "drivers/staging/media/go7007/Kconfig" -source "drivers/staging/media/msi3101/Kconfig" - source "drivers/staging/media/omap24xx/Kconfig" source "drivers/staging/media/solo6x10/Kconfig" diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile index e1e053a357cc..4f6c0ee0ad13 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -5,7 +5,6 @@ obj-$(CONFIG_LIRC_STAGING) += lirc/ obj-$(CONFIG_SOLO6X10) += solo6x10/ obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/ obj-$(CONFIG_VIDEO_GO7007) += go7007/ -obj-$(CONFIG_USB_MSI3101) += msi3101/ obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/ obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/ obj-$(CONFIG_VIDEO_OMAP2) += omap24xx/ diff --git a/drivers/staging/media/msi3101/Kconfig b/drivers/staging/media/msi3101/Kconfig deleted file mode 100644 index 399dbbb0039c..000000000000 --- a/drivers/staging/media/msi3101/Kconfig +++ /dev/null @@ -1,7 +0,0 @@ -config USB_MSI3101 - tristate "Mirics MSi3101 SDR Dongle" - depends on USB && VIDEO_DEV && VIDEO_V4L2 && SPI - select VIDEOBUF2_CORE - select VIDEOBUF2_VMALLOC - select MEDIA_TUNER_MSI001 - diff --git a/drivers/staging/media/msi3101/Makefile b/drivers/staging/media/msi3101/Makefile deleted file mode 100644 index 3730654b0eb9..000000000000 --- a/drivers/staging/media/msi3101/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_USB_MSI3101) += sdr-msi3101.o |