From c3220ca3a955b5791845c822fabf476e987445ab Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 23 Aug 2007 18:12:08 -0300 Subject: Rename video-buf-dvb to videobuf-dvb to be consistent with the other patches Signed-off-by: Mauro Carvalho Chehab --- linux/include/media/video-buf-dvb.h | 45 ------------------------------------- linux/include/media/videobuf-dvb.h | 45 +++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 linux/include/media/video-buf-dvb.h create mode 100644 linux/include/media/videobuf-dvb.h (limited to 'linux/include/media') diff --git a/linux/include/media/video-buf-dvb.h b/linux/include/media/video-buf-dvb.h deleted file mode 100644 index 92545a0a2..000000000 --- a/linux/include/media/video-buf-dvb.h +++ /dev/null @@ -1,45 +0,0 @@ -#include -#include -#include -#include -#include - -struct videobuf_dvb { - /* filling that the job of the driver */ - char *name; - struct dvb_frontend *frontend; - struct videobuf_queue dvbq; - - /* video-buf-dvb state info */ -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) - struct mutex lock; -#else - struct semaphore lock; -#endif - struct task_struct *thread; - int nfeeds; - - /* videobuf_dvb_(un)register manges this */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)) - struct dvb_adapter adapter; -#else - struct dvb_adapter *adapter; -#endif - struct dvb_demux demux; - struct dmxdev dmxdev; - struct dmx_frontend fe_hw; - struct dmx_frontend fe_mem; - struct dvb_net net; -}; - -int videobuf_dvb_register(struct videobuf_dvb *dvb, - struct module *module, - void *adapter_priv, - struct device *device); -void videobuf_dvb_unregister(struct videobuf_dvb *dvb); - -/* - * Local variables: - * c-basic-offset: 8 - * End: - */ diff --git a/linux/include/media/videobuf-dvb.h b/linux/include/media/videobuf-dvb.h new file mode 100644 index 000000000..92545a0a2 --- /dev/null +++ b/linux/include/media/videobuf-dvb.h @@ -0,0 +1,45 @@ +#include +#include +#include +#include +#include + +struct videobuf_dvb { + /* filling that the job of the driver */ + char *name; + struct dvb_frontend *frontend; + struct videobuf_queue dvbq; + + /* video-buf-dvb state info */ +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) + struct mutex lock; +#else + struct semaphore lock; +#endif + struct task_struct *thread; + int nfeeds; + + /* videobuf_dvb_(un)register manges this */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)) + struct dvb_adapter adapter; +#else + struct dvb_adapter *adapter; +#endif + struct dvb_demux demux; + struct dmxdev dmxdev; + struct dmx_frontend fe_hw; + struct dmx_frontend fe_mem; + struct dvb_net net; +}; + +int videobuf_dvb_register(struct videobuf_dvb *dvb, + struct module *module, + void *adapter_priv, + struct device *device); +void videobuf_dvb_unregister(struct videobuf_dvb *dvb); + +/* + * Local variables: + * c-basic-offset: 8 + * End: + */ -- cgit v1.2.3