diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-31 12:01:29 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-31 12:01:29 -0200 |
| commit | f902a281e447bad49c3fc1c855035a337bbcefab (patch) | |
| tree | 35778b00a4f7b82bf40dcfc4f027bbd0308ff000 /linux/include/media | |
| parent | 88f332f73bffc942ecd8aee59abd34df3fd69d6b (diff) | |
| parent | c7c16254d06970012c0473a2ca358e7725c35d91 (diff) | |
| download | mediapointer-dvb-s2-f902a281e447bad49c3fc1c855035a337bbcefab.tar.gz mediapointer-dvb-s2-f902a281e447bad49c3fc1c855035a337bbcefab.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tuner-simple
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/v4l2-common.h | 3 | ||||
| -rw-r--r-- | linux/include/media/videobuf-core.h | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/linux/include/media/v4l2-common.h b/linux/include/media/v4l2-common.h index 10fc32e16..d225eac1e 100644 --- a/linux/include/media/v4l2-common.h +++ b/linux/include/media/v4l2-common.h @@ -69,9 +69,6 @@ /* Prints the ioctl in a human-readable format */ extern void v4l_printk_ioctl(unsigned int cmd); -#if 0 -extern void v4l_printk_ioctl_arg(const char *s, unsigned int cmd, const void *arg); -#endif /* 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/videobuf-core.h b/linux/include/media/videobuf-core.h index 9bb244716..b73f0ffa8 100644 --- a/linux/include/media/videobuf-core.h +++ b/linux/include/media/videobuf-core.h @@ -150,9 +150,9 @@ struct videobuf_qtype_ops { struct videobuf_queue { #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) - struct mutex lock; + struct mutex vb_lock; #else - struct semaphore lock; + struct semaphore vb_lock; #endif spinlock_t *irqlock; void *dev; /* on pci, points to struct pci_dev */ |