V4L/DVB (6881): include struct analog_demod_ops directly inside struct dvb_frontend

[linux-2.6] / drivers / media / dvb / dvb-core / dvb_frontend.h

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index 417802f83f7e12f23c099e4fd4b714677778c282..aa4133f0bd1911d093b4e386aba4ab0c965f6ba8 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -105,7 +105,7 @@ struct analog_demod_info {
        char *name;
 };
 
-struct analog_tuner_ops {
+struct analog_demod_ops {
 
        struct analog_demod_info info;
 
@@ -168,7 +168,7 @@ struct dvb_frontend_ops {
        int (*ts_bus_ctrl)(struct dvb_frontend* fe, int acquire);
 
        struct dvb_tuner_ops tuner_ops;
-       struct analog_tuner_ops *analog_demod_ops;
+       struct analog_demod_ops analog_ops;
 };
 
 #define MAX_EVENT 8