From: Mauro Carvalho Chehab <m.chehab@samsung.com>
Date: Tue, 12 Aug 2014 21:50:23 +0000 (-0300)
Subject: [media] as102-fe: make it an independent driver
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dcae77814865122ed411de1a4e8ebd02796cf3c4;p=linux-beck.git

[media] as102-fe: make it an independent driver

Move as102-fe to dvb-frontends directory and make it an
independent driver.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---

diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig
index fe0ddcca192c..aa5ae224626a 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 edf103d45920..fc4e689d4b67 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 f57560c191ae..b272e4ea1860 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 4098cf8f8cf9..a7c91430ca3d 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 8916d8a909bc..22f43eee4a3b 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 8868c52500ee..ef238022dfe5 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 83c0440dba2f..09134f73ba3d 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 833463343ada..6f9dea1d860b 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"
 
 /***************************/