浏览代码

[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>
Mauro Carvalho Chehab 11 年之前
父节点
当前提交
dcae778148

+ 5 - 0
drivers/media/dvb-frontends/Kconfig

@@ -471,6 +471,11 @@ config DVB_SI2168
 	help
 	help
 	  Say Y when you want to support this frontend.
 	  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"
 comment "DVB-C (cable) frontends"
 	depends on DVB_CORE
 	depends on DVB_CORE
 
 

+ 1 - 1
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_RTL2832_SDR) += rtl2832_sdr.o
 obj-$(CONFIG_DVB_M88RS2000) += m88rs2000.o
 obj-$(CONFIG_DVB_M88RS2000) += m88rs2000.o
 obj-$(CONFIG_DVB_AF9033) += af9033.o
 obj-$(CONFIG_DVB_AF9033) += af9033.o
-
+obj-$(CONFIG_DVB_AS102_FE) += as102_fe.o

+ 4 - 0
drivers/media/usb/as102/as102_fe.c → drivers/media/dvb-frontends/as102_fe.c

@@ -464,3 +464,7 @@ struct dvb_frontend *as102_attach(const char *name,
 
 
 }
 }
 EXPORT_SYMBOL_GPL(as102_attach);
 EXPORT_SYMBOL_GPL(as102_attach);
+
+MODULE_DESCRIPTION("as102-fe");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Pierrick Hascoet <pierrick.hascoet@abilis.com>");

+ 1 - 1
drivers/media/usb/as102/as102_fe.h → drivers/media/dvb-frontends/as102_fe.h

@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  * GNU General Public License for more details.
  */
  */
 
 
-#include "as10x_types.h"
+#include "as102_fe_types.h"
 
 
 struct as102_fe_ops {
 struct as102_fe_ops {
 	int (*set_tune)(void *priv, struct as10x_tune_args *tune_args);
 	int (*set_tune)(void *priv, struct as10x_tune_args *tune_args);

+ 0 - 0
drivers/media/usb/as102/as10x_types.h → drivers/media/dvb-frontends/as102_fe_types.h


+ 2 - 1
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 \
 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
 obj-$(CONFIG_DVB_AS102) += dvb-as102.o
 
 
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-core
+ccflags-y += -Idrivers/media/dvb-frontends

+ 0 - 1
drivers/media/usb/as102/as10x_cmd.c

@@ -16,7 +16,6 @@
 
 
 #include <linux/kernel.h>
 #include <linux/kernel.h>
 #include "as102_drv.h"
 #include "as102_drv.h"
-#include "as10x_types.h"
 #include "as10x_cmd.h"
 #include "as10x_cmd.h"
 
 
 /**
 /**

+ 1 - 1
drivers/media/usb/as102/as10x_cmd.h

@@ -17,7 +17,7 @@
 
 
 #include <linux/kernel.h>
 #include <linux/kernel.h>
 
 
-#include "as10x_types.h"
+#include "as102_fe_types.h"
 
 
 /*********************************/
 /*********************************/
 /*       MACRO DEFINITIONS       */
 /*       MACRO DEFINITIONS       */

+ 0 - 1
drivers/media/usb/as102/as10x_cmd_cfg.c

@@ -15,7 +15,6 @@
 
 
 #include <linux/kernel.h>
 #include <linux/kernel.h>
 #include "as102_drv.h"
 #include "as102_drv.h"
-#include "as10x_types.h"
 #include "as10x_cmd.h"
 #include "as10x_cmd.h"
 
 
 /***************************/
 /***************************/