diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-04 07:10:49 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-04 07:10:49 -0200 |
| commit | f52b2578a8baa1467c26cc06ec6b09669f0e7d04 (patch) | |
| tree | d28dc0390b12c5cbc174bf3d7517a6ed7a5a3282 /linux/include | |
| parent | ac9fa7bdbf76e9a529779421a6d76eef93d175f7 (diff) | |
| parent | 035d79af6c56bdefa3f974a15ff6306108ac5dc4 (diff) | |
| download | mediapointer-dvb-s2-f52b2578a8baa1467c26cc06ec6b09669f0e7d04.tar.gz mediapointer-dvb-s2-f52b2578a8baa1467c26cc06ec6b09669f0e7d04.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tuner
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/media/v4l2-common.h | 2 | ||||
| -rw-r--r-- | linux/include/media/v4l2-dev.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/include/media/v4l2-common.h b/linux/include/media/v4l2-common.h index d225eac1e..72ed0ddb2 100644 --- a/linux/include/media/v4l2-common.h +++ b/linux/include/media/v4l2-common.h @@ -67,8 +67,6 @@ v4l_client_printk(KERN_DEBUG, client, fmt , ## arg); \ } while (0) -/* Prints the ioctl in a human-readable format */ -extern void v4l_printk_ioctl(unsigned int cmd); /* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */ #define v4l_print_ioctl(name, cmd) \ diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index 64918029f..fac381990 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -50,6 +50,8 @@ extern unsigned int v4l2_video_std_fps(struct v4l2_standard *vs); extern char *v4l2_norm_to_name(v4l2_std_id id); extern int v4l2_video_std_construct(struct v4l2_standard *vs, int id, char *name); +/* Prints the ioctl in a human-readable format */ +extern void v4l_printk_ioctl(unsigned int cmd); /* prority handling */ struct v4l2_prio_state { |