[media] airspy: move out of staging into drivers/media/usb

Move it out of staging into media like all the other SDR drivers
too. There is no good reasons to keep these SDR drivers in staging.

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-17 21:42:24 -03:00 committed by Mauro Carvalho Chehab
parent eb83eab7fe
commit f3e775962c
8 changed files with 12 additions and 7 deletions

View File

@ -54,6 +54,7 @@ endif
if MEDIA_SDR_SUPPORT
comment "Software defined radio USB devices"
source "drivers/media/usb/airspy/Kconfig"
endif
endif #MEDIA_USB_SUPPORT

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_AIRSPY) += airspy/
obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
obj-$(CONFIG_VIDEO_AU0828) += au0828/
obj-$(CONFIG_VIDEO_HDPVR) += hdpvr/

View File

@ -0,0 +1,10 @@
config USB_AIRSPY
tristate "AirSpy"
depends on VIDEO_V4L2
select VIDEOBUF2_VMALLOC
---help---
This is a video4linux2 driver for AirSpy SDR device.
To compile this driver as a module, choose M here: the
module will be called airspy

View File

@ -19,7 +19,6 @@ menuconfig STAGING_MEDIA
if STAGING_MEDIA
# Please keep them in alphabetic order
source "drivers/staging/media/airspy/Kconfig"
source "drivers/staging/media/as102/Kconfig"
source "drivers/staging/media/bcm2048/Kconfig"

View File

@ -1,4 +1,3 @@
obj-$(CONFIG_USB_AIRSPY) += airspy/
obj-$(CONFIG_DVB_AS102) += as102/
obj-$(CONFIG_I2C_BCM2048) += bcm2048/
obj-$(CONFIG_DVB_CXD2099) += cxd2099/

View File

@ -1,5 +0,0 @@
config USB_AIRSPY
tristate "AirSpy"
depends on USB && VIDEO_DEV && VIDEO_V4L2 && I2C
select VIDEOBUF2_VMALLOC
default m if !MEDIA_SUBDRV_AUTOSELECT