diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig
index fe0ddcca192c0f33f0bb7c3224bf0954b9fb5a35..aa5ae224626a67b5632a09921e1d202ab76f3409 100644
--- a/drivers/media/dvb-frontends/Kconfig
+++ b/drivers/media/dvb-frontends/Kconfig
@@ -471,6 +471,11 @@ config DVB_SI2168
 	help
 	  Say Y when you want to support this frontend.
 
+config DVB_AS102_FE
+	tristate
+	depends on DVB_CORE
+	default DVB_AS102
+
 comment "DVB-C (cable) frontends"
 	depends on DVB_CORE
 
diff --git a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile
index edf103d45920238df61e41917fb64126f9983eb1..fc4e689d4b6714f009568e3a53008bb293d87f3a 100644
--- a/drivers/media/dvb-frontends/Makefile
+++ b/drivers/media/dvb-frontends/Makefile
@@ -113,4 +113,4 @@ obj-$(CONFIG_DVB_RTL2832) += rtl2832.o
 obj-$(CONFIG_DVB_RTL2832_SDR) += rtl2832_sdr.o
 obj-$(CONFIG_DVB_M88RS2000) += m88rs2000.o
 obj-$(CONFIG_DVB_AF9033) += af9033.o
-
+obj-$(CONFIG_DVB_AS102_FE) += as102_fe.o
diff --git a/drivers/media/usb/as102/as102_fe.c b/drivers/media/dvb-frontends/as102_fe.c
similarity index 98%
rename from drivers/media/usb/as102/as102_fe.c
rename to drivers/media/dvb-frontends/as102_fe.c
index f57560c191ae049fab17450ea6fe7ea95dfc5b17..b272e4ea186032cd8053e541b3dcfa81aaeb6b0a 100644
--- a/drivers/media/usb/as102/as102_fe.c
+++ b/drivers/media/dvb-frontends/as102_fe.c
@@ -464,3 +464,7 @@ struct dvb_frontend *as102_attach(const char *name,
 
 }
 EXPORT_SYMBOL_GPL(as102_attach);
+
+MODULE_DESCRIPTION("as102-fe");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Pierrick Hascoet <pierrick.hascoet@abilis.com>");
diff --git a/drivers/media/usb/as102/as102_fe.h b/drivers/media/dvb-frontends/as102_fe.h
similarity index 97%
rename from drivers/media/usb/as102/as102_fe.h
rename to drivers/media/dvb-frontends/as102_fe.h
index 4098cf8f8cf9fa1d0e1bd842bd8809a929e71e6b..a7c91430ca3d7a20b4e0fd683027390752f1bc6d 100644
--- a/drivers/media/usb/as102/as102_fe.h
+++ b/drivers/media/dvb-frontends/as102_fe.h
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include "as10x_types.h"
+#include "as102_fe_types.h"
 
 struct as102_fe_ops {
 	int (*set_tune)(void *priv, struct as10x_tune_args *tune_args);
diff --git a/drivers/media/usb/as102/as10x_types.h b/drivers/media/dvb-frontends/as102_fe_types.h
similarity index 100%
rename from drivers/media/usb/as102/as10x_types.h
rename to drivers/media/dvb-frontends/as102_fe_types.h
diff --git a/drivers/media/usb/as102/Makefile b/drivers/media/usb/as102/Makefile
index 8916d8a909bc6dec3c499f73309e8623a4da028a..22f43eee4a3bc5fa55fe7fc2675e9062a2b6fec2 100644
--- a/drivers/media/usb/as102/Makefile
+++ b/drivers/media/usb/as102/Makefile
@@ -1,6 +1,7 @@
 dvb-as102-objs := as102_drv.o as102_fw.o as10x_cmd.o as10x_cmd_stream.o \
-		as102_fe.o as102_usb_drv.o as10x_cmd_cfg.o
+		  as102_usb_drv.o as10x_cmd_cfg.o
 
 obj-$(CONFIG_DVB_AS102) += dvb-as102.o
 
 ccflags-y += -Idrivers/media/dvb-core
+ccflags-y += -Idrivers/media/dvb-frontends
diff --git a/drivers/media/usb/as102/as10x_cmd.c b/drivers/media/usb/as102/as10x_cmd.c
index 8868c52500ee8beba7c9520ca1d4678409b420af..ef238022dfe51577bb622b6d0bf514e37c3cf791 100644
--- a/drivers/media/usb/as102/as10x_cmd.c
+++ b/drivers/media/usb/as102/as10x_cmd.c
@@ -16,7 +16,6 @@
 
 #include <linux/kernel.h>
 #include "as102_drv.h"
-#include "as10x_types.h"
 #include "as10x_cmd.h"
 
 /**
diff --git a/drivers/media/usb/as102/as10x_cmd.h b/drivers/media/usb/as102/as10x_cmd.h
index 83c0440dba2f71f025f7784da3e0d91c4a11493c..09134f73ba3d0d5d916773af2fb1bebf357c7f49 100644
--- a/drivers/media/usb/as102/as10x_cmd.h
+++ b/drivers/media/usb/as102/as10x_cmd.h
@@ -17,7 +17,7 @@
 
 #include <linux/kernel.h>
 
-#include "as10x_types.h"
+#include "as102_fe_types.h"
 
 /*********************************/
 /*       MACRO DEFINITIONS       */
diff --git a/drivers/media/usb/as102/as10x_cmd_cfg.c b/drivers/media/usb/as102/as10x_cmd_cfg.c
index 833463343adad93748b54986057a17bc54339c85..6f9dea1d860b5acdef9ff8917536ba24ebe3d149 100644
--- a/drivers/media/usb/as102/as10x_cmd_cfg.c
+++ b/drivers/media/usb/as102/as10x_cmd_cfg.c
@@ -15,7 +15,6 @@
 
 #include <linux/kernel.h>
 #include "as102_drv.h"
-#include "as10x_types.h"
 #include "as10x_cmd.h"
 
 /***************************/