summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/dvb-pll.h
diff options
context:
space:
mode:
authorSteven Whitehouse <steve@men-an-tol.chygwyn.com>2006-02-23 10:49:43 +0100
committerSteven Whitehouse <swhiteho@redhat.com>2006-02-23 10:49:43 +0100
commitd35462b4bb847b68321c55e95c926aa485aecce2 (patch)
treeb08e18bf6e672633402871ee763102fdb5e63229 /drivers/media/dvb/frontends/dvb-pll.h
parent[GFS2] Missed deletion of debugging code (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
downloadlinux-d35462b4bb847b68321c55e95c926aa485aecce2.tar.xz
linux-d35462b4bb847b68321c55e95c926aa485aecce2.zip
Merge branch 'master'
Diffstat (limited to 'drivers/media/dvb/frontends/dvb-pll.h')
-rw-r--r--drivers/media/dvb/frontends/dvb-pll.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/dvb-pll.h b/drivers/media/dvb/frontends/dvb-pll.h
index f682c09189b3..bb8d4b4eb183 100644
--- a/drivers/media/dvb/frontends/dvb-pll.h
+++ b/drivers/media/dvb/frontends/dvb-pll.h
@@ -38,7 +38,7 @@ extern struct dvb_pll_desc dvb_pll_tded4;
extern struct dvb_pll_desc dvb_pll_tuv1236d;
extern struct dvb_pll_desc dvb_pll_tdhu2;
-extern struct dvb_pll_desc dvb_pll_tbmv30111in;
+extern struct dvb_pll_desc dvb_pll_samsung_tbmv;
extern struct dvb_pll_desc dvb_pll_philips_sd1878_tda8261;
int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,