Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

[linux-2.6-omap-h63xx.git] / include / media / videobuf-dvb.h

diff --git a/include/media/videobuf-dvb.h b/include/media/videobuf-dvb.h
index 47bc2c5e7ba947dbdebd45ffa4ff8538c55273d3..6ba4f1271d237f7af4c5166040992f7ad8a96200 100644 (file)
--- a/include/media/videobuf-dvb.h
+++ b/include/media/videobuf-dvb.h
@@ -16,7 +16,6 @@ struct videobuf_dvb {
        int                        nfeeds;
 
        /* videobuf_dvb_(un)register manges this */
-       struct dvb_adapter         adapter;
        struct dvb_demux           demux;
        struct dmxdev              dmxdev;
        struct dmx_frontend        fe_hw;
@@ -25,17 +24,16 @@ struct videobuf_dvb {
 };
 
 struct videobuf_dvb_frontend {
-       void *dev;
        struct list_head felist;
        int id;
        struct videobuf_dvb dvb;
 };
 
 struct videobuf_dvb_frontends {
+       struct list_head felist;
        struct mutex lock;
        struct dvb_adapter adapter;
        int active_fe_id; /* Indicates which frontend in the felist is in use */
-       struct videobuf_dvb_frontend frontend;
        int gate; /* Frontend with gate control 0=!MFE,1=fe0,2=fe1 etc */
 };
 
@@ -43,20 +41,13 @@ int videobuf_dvb_register_bus(struct videobuf_dvb_frontends *f,
                          struct module *module,
                          void *adapter_priv,
                          struct device *device,
-                         short *adapter_nr);   //NEW
+                         short *adapter_nr,
+                         int mfe_shared);
 
 void videobuf_dvb_unregister_bus(struct videobuf_dvb_frontends *f);
 
-int videobuf_dvb_register_adapter(struct videobuf_dvb_frontends *f,
-                         struct module *module,
-                         void *adapter_priv,
-                         struct device *device,
-                         char *adapter_name,
-                         short *adapter_nr);   //NEW
-
-int videobuf_dvb_register_frontend(struct dvb_adapter *adapter, struct videobuf_dvb *dvb);
-
-struct videobuf_dvb_frontend * videobuf_dvb_alloc_frontend(void *private, struct videobuf_dvb_frontends *f, int id);
+struct videobuf_dvb_frontend * videobuf_dvb_alloc_frontend(struct videobuf_dvb_frontends *f, int id);
+void videobuf_dvb_dealloc_frontends(struct videobuf_dvb_frontends *f);
 
 struct videobuf_dvb_frontend * videobuf_dvb_get_frontend(struct videobuf_dvb_frontends *f, int id);
 int videobuf_dvb_find_frontend(struct videobuf_dvb_frontends *f, struct dvb_frontend *p);