---

yaml --- r: 330649 b: refs/heads/master c: 41a0abf h: refs/heads/master i: 330647: 26c3638 v: v3
git-mirror · Aug 4, 2012 · ed8d4d3 · ed8d4d3
1 parent 11e343a
commit ed8d4d3
Show file tree

Hide file tree

Showing 4 changed files with 420 additions and 38 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62a5f449cab52a458120ba5b046675ee2f81000f
+refs/heads/master: 41a0abf7100928b412be4d35d62fd77c83064a9b
diff --git a/trunk/drivers/media/dvb/dvb-usb/Makefile b/trunk/drivers/media/dvb/dvb-usb/Makefile
@@ -1,7 +1,7 @@
 dvb-usb-objs = dvb-usb-firmware.o dvb-usb-init.o dvb-usb-urb.o dvb-usb-i2c.o dvb-usb-dvb.o dvb-usb-remote.o usb-urb.o
 obj-$(CONFIG_DVB_USB) += dvb-usb.o
 
-dvb_usbv2-objs = dvb_usb_init.o dvb_usb_urb.o dvb_usb_dvb.o usb_urb.o
+dvb_usbv2-objs = dvb_usb_core.o dvb_usb_urb.o usb_urb.o
 obj-$(CONFIG_DVB_USB_V2) += dvb_usbv2.o
 
 obj-$(CONFIG_DVB_USB_FIRMWARE) += dvb_usb_firmware.o

diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_common.h b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_common.h
@@ -11,24 +11,12 @@
 
 #include "dvb_usb.h"
 
-extern int dvb_usbv2_disable_rc_polling;
-
 /* commonly used  methods */
-extern int dvb_usbv2_device_power_ctrl(struct dvb_usb_device *d, int onoff);
-
 extern int usb_urb_initv2(struct usb_data_stream *stream,
 		const struct usb_data_stream_properties *props);
 extern int usb_urb_exitv2(struct usb_data_stream *stream);
 extern int usb_urb_submitv2(struct usb_data_stream *stream,
 		struct usb_data_stream_properties *props);
 extern int usb_urb_killv2(struct usb_data_stream *stream);
 
-extern int dvb_usbv2_adapter_stream_init(struct dvb_usb_adapter *adap);
-extern int dvb_usbv2_adapter_stream_exit(struct dvb_usb_adapter *adap);
-
-extern int dvb_usbv2_adapter_dvb_init(struct dvb_usb_adapter *adap);
-extern int dvb_usbv2_adapter_dvb_exit(struct dvb_usb_adapter *adap);
-extern int dvb_usbv2_adapter_frontend_init(struct dvb_usb_adapter *adap);
-extern int dvb_usbv2_adapter_frontend_exit(struct dvb_usb_adapter *adap);
-
 #endif