From: Andreas Oberritter <[EMAIL PROTECTED]>
Removed unused descramble_mac_address and descramble_section_payload callbacks.
Signed-off-by: Andreas Oberritter <[EMAIL PROTECTED]>
Signed-off-by: Johannes Stezenbach <[EMAIL PROTECTED]>
drivers/media/dvb/dvb-core/demux.h | 11 -----------
drivers/media/dvb/dvb-core/dvb_demux.c | 3 ---
2 files changed, 14 deletions(-)
--- linux-2.6.13-git4.orig/drivers/media/dvb/dvb-core/demux.h 2005-09-04
22:27:55.000000000 +0200
+++ linux-2.6.13-git4/drivers/media/dvb/dvb-core/demux.h 2005-09-04
22:27:56.000000000 +0200
@@ -260,17 +260,6 @@ struct dmx_demux {
dmx_section_cb callback);
int (*release_section_feed) (struct dmx_demux* demux,
struct dmx_section_feed* feed);
- int (*descramble_mac_address) (struct dmx_demux* demux,
- u8* buffer1,
- size_t buffer1_length,
- u8* buffer2,
- size_t buffer2_length,
- u16 pid);
- int (*descramble_section_payload) (struct dmx_demux* demux,
- u8* buffer1,
- size_t buffer1_length,
- u8* buffer2, size_t buffer2_length,
- u16 pid);
int (*add_frontend) (struct dmx_demux* demux,
struct dmx_frontend* frontend);
int (*remove_frontend) (struct dmx_demux* demux,
--- linux-2.6.13-git4.orig/drivers/media/dvb/dvb-core/dvb_demux.c
2005-09-04 22:27:55.000000000 +0200
+++ linux-2.6.13-git4/drivers/media/dvb/dvb-core/dvb_demux.c 2005-09-04
22:27:56.000000000 +0200
@@ -1232,9 +1232,6 @@ int dvb_dmx_init(struct dvb_demux *dvbde
dmx->allocate_section_feed = dvbdmx_allocate_section_feed;
dmx->release_section_feed = dvbdmx_release_section_feed;
- dmx->descramble_mac_address = NULL;
- dmx->descramble_section_payload = NULL;
-
dmx->add_frontend = dvbdmx_add_frontend;
dmx->remove_frontend = dvbdmx_remove_frontend;
dmx->get_frontends = dvbdmx_get_frontends;
--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
