diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
index f8c1099..38b6fe1 100644
--- a/drivers/media/usb/Kconfig
+++ b/drivers/media/usb/Kconfig
@@ -54,6 +54,7 @@
 
 if MEDIA_SDR_SUPPORT
 	comment "Software defined radio USB devices"
+source "drivers/media/usb/airspy/Kconfig"
 endif
 
 endif #MEDIA_USB_SUPPORT
diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
index 7ac4b14..05d69c2 100644
--- a/drivers/media/usb/Makefile
+++ b/drivers/media/usb/Makefile
@@ -9,6 +9,7 @@
 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/
diff --git a/drivers/media/usb/airspy/Kconfig b/drivers/media/usb/airspy/Kconfig
new file mode 100644
index 0000000..10b204c
--- /dev/null
+++ b/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
+
diff --git a/drivers/staging/media/airspy/Makefile b/drivers/media/usb/airspy/Makefile
similarity index 100%
rename from drivers/staging/media/airspy/Makefile
rename to drivers/media/usb/airspy/Makefile
diff --git a/drivers/staging/media/airspy/airspy.c b/drivers/media/usb/airspy/airspy.c
similarity index 100%
rename from drivers/staging/media/airspy/airspy.c
rename to drivers/media/usb/airspy/airspy.c
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 8abda14..a326d5d 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -19,7 +19,6 @@
 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"
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 74a9d5a..e1e053a 100644
--- a/drivers/staging/media/Makefile
+++ b/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/
diff --git a/drivers/staging/media/airspy/Kconfig b/drivers/staging/media/airspy/Kconfig
deleted file mode 100644
index 59a829b..0000000
--- a/drivers/staging/media/airspy/Kconfig
+++ /dev/null
@@ -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