summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bttv-driver.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-06-10 17:20:24 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-06-10 17:20:24 +0000
commitd2842f6dd9787dd3369728db1caba2487330ef7d (patch)
treeb8781a8ac98d1982db379790f308fac8e56fb76a /linux/drivers/media/video/bttv-driver.c
parent7b4d77f88caf46e29fabd3390e6aa06904ce4181 (diff)
downloadmediapointer-dvb-s2-d2842f6dd9787dd3369728db1caba2487330ef7d.tar.gz
mediapointer-dvb-s2-d2842f6dd9787dd3369728db1caba2487330ef7d.tar.bz2
- Syncrhronized with linux-2.6.12-rc6-mm1.
- Should compile cleanly with linux-2.6.11 also. make snapshot improved.
Diffstat (limited to 'linux/drivers/media/video/bttv-driver.c')
-rw-r--r--linux/drivers/media/video/bttv-driver.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index b6f69b7f6..c27b2758f 100644
--- a/linux/drivers/media/video/bttv-driver.c
+++ b/linux/drivers/media/video/bttv-driver.c
@@ -1,5 +1,5 @@
/*
- $Id: bttv-driver.c,v 1.37 2005/02/21 13:57:59 kraxel Exp $
+ $Id: bttv-driver.c,v 1.38 2005/06/10 17:20:24 mchehab Exp $
bttv - Bt848 frame grabber driver
@@ -3176,7 +3176,7 @@ static struct video_device radio_template =
/* ----------------------------------------------------------------------- */
/* some debug code */
-int bttv_risc_decode(u32 risc)
+static int bttv_risc_decode(u32 risc)
{
static char *instr[16] = {
[ BT848_RISC_WRITE >> 28 ] = "write",
@@ -3213,8 +3213,8 @@ int bttv_risc_decode(u32 risc)
return incr[risc >> 28] ? incr[risc >> 28] : 1;
}
-void bttv_risc_disasm(struct bttv *btv,
- struct btcx_riscmem *risc)
+static void bttv_risc_disasm(struct bttv *btv,
+ struct btcx_riscmem *risc)
{
unsigned int i,j,n;