summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx231xx/cx231xx.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-06-06 08:15:26 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-06 08:15:26 -0300
commita54e4ff7ad973562ecb961a02ea8da66e2334aef (patch)
treefe475f0216d4971e771364a4fce63e759fd858ac /linux/drivers/media/video/cx231xx/cx231xx.h
parentab62c90c3f2b6debe4c45c66aa08b5a65039e40e (diff)
parentd336dddd42e43b5465cd58b5a4812011805905df (diff)
downloadmediapointer-dvb-s2-a54e4ff7ad973562ecb961a02ea8da66e2334aef.tar.gz
mediapointer-dvb-s2-a54e4ff7ad973562ecb961a02ea8da66e2334aef.tar.bz2
merge: http://kernellabs.com/hg/~dheitmueller/misc-fixes-2
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx231xx/cx231xx.h')
-rw-r--r--linux/drivers/media/video/cx231xx/cx231xx.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx231xx/cx231xx.h b/linux/drivers/media/video/cx231xx/cx231xx.h
index c436f2b0d..051ca21c1 100644
--- a/linux/drivers/media/video/cx231xx/cx231xx.h
+++ b/linux/drivers/media/video/cx231xx/cx231xx.h
@@ -731,9 +731,6 @@ int cx231xx_set_video_input_mux(struct cx231xx *dev, u8 input);
int cx231xx_set_decoder_video_input(struct cx231xx *dev, u8 pin_type, u8 input);
int cx231xx_do_mode_ctrl_overrides(struct cx231xx *dev);
int cx231xx_set_audio_input(struct cx231xx *dev, u8 input);
-void get_scale(struct cx231xx *dev,
- unsigned int width, unsigned int height,
- unsigned int *hscale, unsigned int *vscale);
/* Provided by cx231xx-video.c */
int cx231xx_register_extension(struct cx231xx_ops *dev);