diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-24 15:24:04 +0100 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-24 15:24:04 +0100 |
commit | 11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e (patch) | |
tree | b01421cb139b11065d776ed361a7a12b3a1aecc9 /drivers/media/dvb/frontends/cx24110.h | |
parent | Merge branch 'upstream' (diff) | |
parent | [libata] Move some bmdma-specific code to libata-bmdma.c (diff) | |
download | linux-11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e.tar.xz linux-11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e.zip |
Merge branch 'upstream'
Conflicts:
drivers/scsi/sata_vsc.c
Diffstat (limited to 'drivers/media/dvb/frontends/cx24110.h')
-rw-r--r-- | drivers/media/dvb/frontends/cx24110.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb/frontends/cx24110.h b/drivers/media/dvb/frontends/cx24110.h index b63ecf26421a..609ac642b406 100644 --- a/drivers/media/dvb/frontends/cx24110.h +++ b/drivers/media/dvb/frontends/cx24110.h @@ -35,6 +35,7 @@ struct cx24110_config /* PLL maintenance */ int (*pll_init)(struct dvb_frontend* fe); int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params); + int (*pll_sleep)(struct dvb_frontend* fe); }; extern struct dvb_frontend* cx24110_attach(const struct cx24110_config* config, |