renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 12:14:01 +08:00
Code

msi2500: move msi3101 out of staging and rename

Browse Source 
Move msi3101 out of staging and rename to msi2500.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Antti Palosaari 2014-07-13 04:12:05 +03:00 committed by Mauro Carvalho Chehab
parent 1b303e1a58
commit fd8b5f5029
9 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/usb/Kconfig
View File

@ -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

1
drivers/media/usb/Makefile
View File

@ -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/

5
drivers/media/usb/msi2500/Kconfig Normal file
View File

@ -0,0 +1,5 @@
config USB_MSI2500
tristate "Mirics MSi2500"
depends on VIDEO_V4L2 && SPI
select VIDEOBUF2_VMALLOC
select MEDIA_TUNER_MSI001

1
drivers/media/usb/msi2500/Makefile Normal file
View File

@ -0,0 +1 @@
obj-$(CONFIG_USB_MSI2500) += msi2500.o

0
drivers/staging/media/msi3101/sdr-msi3101.c → drivers/media/usb/msi2500/msi2500.c
View File

2
drivers/staging/media/Kconfig
View File

@ -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"

1
drivers/staging/media/Makefile
View File

@ -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/

7
drivers/staging/media/msi3101/Kconfig
View File

@ -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

1
drivers/staging/media/msi3101/Makefile
View File

@ -1 +0,0 @@
obj-$(CONFIG_USB_MSI3101) += sdr-msi3101.o