fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / media / video-buf-dvb.h

diff --git a/include/media/video-buf-dvb.h b/include/media/video-buf-dvb.h
index 94bd336..8233caf 100644 (file)
--- a/include/media/video-buf-dvb.h
+++ b/include/media/video-buf-dvb.h
@@ -11,12 +11,12 @@ struct videobuf_dvb {
        struct videobuf_queue      dvbq;
 
        /* video-buf-dvb state info */
-       struct semaphore           lock;
+       struct mutex               lock;
        struct task_struct         *thread;
        int                        nfeeds;
 
        /* videobuf_dvb_(un)register manges this */
-       struct dvb_adapter         *adapter;
+       struct dvb_adapter         adapter;
        struct dvb_demux           demux;
        struct dmxdev              dmxdev;
        struct dmx_frontend        fe_hw;
@@ -26,7 +26,8 @@ struct videobuf_dvb {
 
 int videobuf_dvb_register(struct videobuf_dvb *dvb,
                          struct module *module,
-                         void *adapter_priv);
+                         void *adapter_priv,
+                         struct device *device);
 void videobuf_dvb_unregister(struct videobuf_dvb *dvb);
 
 /*