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 52ddda90d3f655fdb2892818f3e4c7d89171d28c..6ba4f1271d237f7af4c5166040992f7ad8a96200 100644 (file)
--- a/include/media/videobuf-dvb.h
+++ b/include/media/videobuf-dvb.h
@@ -46,17 +46,8 @@ int videobuf_dvb_register_bus(struct videobuf_dvb_frontends *f,
 
 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,
-                         int mfe_shared);
-
-int videobuf_dvb_register_frontend(struct dvb_adapter *adapter, struct videobuf_dvb *dvb);
-
 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);