Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[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..b78d90f 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;