Przeglądaj źródła

[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>
Antti Palosaari 11 lat temu
rodzic
commit
f3e775962c

+ 1 - 0
drivers/media/usb/Kconfig

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

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

+ 10 - 0
drivers/media/usb/airspy/Kconfig

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

+ 0 - 0
drivers/staging/media/airspy/Makefile → drivers/media/usb/airspy/Makefile


+ 0 - 0
drivers/staging/media/airspy/airspy.c → drivers/media/usb/airspy/airspy.c


+ 0 - 1
drivers/staging/media/Kconfig

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

+ 0 - 1
drivers/staging/media/Makefile

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

+ 0 - 5
drivers/staging/media/airspy/Kconfig

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