diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
index 38b6fe108fcffb0afb9f71de54a2f1a052070f2d..fa67519abda2c1b781babeb7cc33db1b66ac94a7 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 05d69c282e1f83ae183f8719463f388c3de4cff2..712a6b1e888201436247fa9b20c35ca354dc14e7 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 0000000000000000000000000000000000000000..9eff8a76ff0e59c0b31b7cd6ea05d3876e350665
--- /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 0000000000000000000000000000000000000000..b3bc2e53707fbb70d9601485a20b47e74593f0b7
--- /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
similarity index 100%
rename from drivers/staging/media/msi3101/sdr-msi3101.c
rename to drivers/media/usb/msi2500/msi2500.c
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index a326d5d95ca846e241f7c784cc32f8657c378b6e..e91c538d3d0d095ca26e34e8abd262bb02ad99ce 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 e1e053a357cceddbc980337358fe1e7617d760cd..4f6c0ee0ad131baa0ce58fbfca31a00de302c39b 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 399dbbb0039cf4fc32763653144cdaece5dd4a8f..0000000000000000000000000000000000000000
--- 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 3730654b0eb951eab39e678b0dbe1135e22ef2de..0000000000000000000000000000000000000000
--- a/drivers/staging/media/msi3101/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_USB_MSI3101)             += sdr-msi3101.o