diff --git a/[refs] b/[refs] index 482e53f17d78..4c6bdc0b561a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a55bc848559d229025f5b2468fbed1070ae377e7 +refs/heads/master: db1d3b80b3d077b6d5936f2afef3e5a84d302c1a diff --git a/trunk/drivers/media/dvb/frontends/stb6100.c b/trunk/drivers/media/dvb/frontends/stb6100.c index 234ca7344a16..426a15272e5f 100644 --- a/trunk/drivers/media/dvb/frontends/stb6100.c +++ b/trunk/drivers/media/dvb/frontends/stb6100.c @@ -516,8 +516,6 @@ static struct dvb_tuner_ops stb6100_ops = { .get_status = stb6100_get_status, .get_state = stb6100_get_state, .set_state = stb6100_set_state, - .get_frequency = stb6100_get_frequency, - .get_bandwidth = stb6100_get_bandwidth, .release = stb6100_release }; @@ -543,7 +541,6 @@ struct dvb_frontend *stb6100_attach(struct dvb_frontend *fe, error: kfree(state); - return NULL; }