summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/dvb-pll.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2005-08-10 08:05:35 -0700
committerSteve French <sfrench@us.ibm.com>2005-08-10 08:05:35 -0700
commita47fd3f5e3a3f970ac1b81643ac56737f97a1fea (patch)
tree09bafe2399f187898ddc6a74176893f0b7f28c6b /drivers/media/dvb/frontends/dvb-pll.h
parentef6724e32142c2d9ca252d423cacc435c142734e (diff)
parent86b3786078d63242d3194ffc58ae8dae1d1bbef3 (diff)
downloadtalos-op-linux-a47fd3f5e3a3f970ac1b81643ac56737f97a1fea.tar.gz
talos-op-linux-a47fd3f5e3a3f970ac1b81643ac56737f97a1fea.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
french@hera:~/linux-2.6(0)$ cg-update l `/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/refs/heads/master' -> `.git/refs/heads/origin' cp: cannot create link `.git/objects/info/packs': File exists progress: 213 objects, 646653 bytes, 77% done `/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/objects/info/packs' -> `.git/objects/info/packs' progress: 983 objects, 2805763 bytes, 100% done cg-pull: objects pull failed
Diffstat (limited to 'drivers/media/dvb/frontends/dvb-pll.h')
-rw-r--r--drivers/media/dvb/frontends/dvb-pll.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb/frontends/dvb-pll.h b/drivers/media/dvb/frontends/dvb-pll.h
index cb794759d89e..205b2d1a8852 100644
--- a/drivers/media/dvb/frontends/dvb-pll.h
+++ b/drivers/media/dvb/frontends/dvb-pll.h
@@ -31,6 +31,7 @@ extern struct dvb_pll_desc dvb_pll_unknown_1;
extern struct dvb_pll_desc dvb_pll_tua6010xs;
extern struct dvb_pll_desc dvb_pll_env57h1xd5;
extern struct dvb_pll_desc dvb_pll_tua6034;
+extern struct dvb_pll_desc dvb_pll_tdvs_tua6034;
extern struct dvb_pll_desc dvb_pll_tda665x;
extern struct dvb_pll_desc dvb_pll_fmd1216me;
extern struct dvb_pll_desc dvb_pll_tded4;
OpenPOWER on IntegriCloud