diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-28 18:38:46 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-28 18:38:46 -0300 |
| commit | 2e4b2d352624030aac8d334836e845b63a1b11ec (patch) | |
| tree | 0317e60357321884d13d2d4276a20e0f1fbca01b /linux | |
| parent | 80f09f603d2001e9a765d66aa5fa5cf5f9f8ed44 (diff) | |
| download | mediapointer-dvb-s2-2e4b2d352624030aac8d334836e845b63a1b11ec.tar.gz mediapointer-dvb-s2-2e4b2d352624030aac8d334836e845b63a1b11ec.tar.bz2 | |
Fix some errors at cx88-mpeg
From: Mauro Carvalho Chehab <mchehab@infradead.org>
The previous cx88-mpeg patch introduced those errors while compiling:
CC [M] /home/v4l/master2/v4l/cx88-mpeg.o
/home/v4l/master2/v4l/cx88-mpeg.c: In function 'cx8802_request_acquire':
/home/v4l/master2/v4l/cx88-mpeg.c:645: warning: comparison between pointer and integer
/home/v4l/master2/v4l/cx88-mpeg.c:645: error: called object '"<7>%s/2-mpeg: "' is not a function
/home/v4l/master2/v4l/cx88-mpeg.c: In function 'cx8802_request_release':
/home/v4l/master2/v4l/cx88-mpeg.c:660: warning: comparison between pointer and integer
/home/v4l/master2/v4l/cx88-mpeg.c:660: error: called object '"<7>%s/2-mpeg: "' is not a function
Also, at cx88.h, it is reintroducing this prototype:
extern void cx88_print_ioctl(char *name, unsigned int cmd)
This function were removed in the past, since it were replaced by a more
generic one on v4l2-common.c.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-mpeg.c | 5 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c index b36373722..b5ef885ac 100644 --- a/linux/drivers/media/video/cx88/cx88-mpeg.c +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c @@ -642,7 +642,8 @@ int cx8802_request_acquire(struct cx8802_driver *drv) { core->active_type_id = drv->type_id; drv->advise_acquire(drv); - mpeg_dbg("%s() Post acquire GPIO=%x\n", __FUNCTION__, cx_read(MO_GP0_IO)); + + mpeg_dbg(1,"%s() Post acquire GPIO=%x\n", __FUNCTION__, cx_read(MO_GP0_IO)); } return 0; @@ -657,7 +658,7 @@ int cx8802_request_release(struct cx8802_driver *drv) { drv->advise_release(drv); core->active_type_id = CX88_BOARD_NONE; - mpeg_dbg("%s() Post release GPIO=%x\n", __FUNCTION__, cx_read(MO_GP0_IO)); + mpeg_dbg(1,"%s() Post release GPIO=%x\n", __FUNCTION__, cx_read(MO_GP0_IO)); } return 0; diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index ee8c95ab2..5f84e3af5 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -552,7 +552,6 @@ struct cx8802_dev { extern void cx88_print_irqbits(char *name, char *tag, char **strings, u32 bits, u32 mask); -extern void cx88_print_ioctl(char *name, unsigned int cmd); extern int cx88_core_irq(struct cx88_core *core, u32 status); extern void cx88_wakeup(struct cx88_core *core, |