diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-16 09:32:53 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-16 09:32:53 -0300 |
| commit | bcb7869683912e8dca99bace426b7e080851354c (patch) | |
| tree | 4d38b5271128b9961a2247e38aa3c24bffbd7e58 /linux/include/media | |
| parent | a38e35700be7bf1a1333cc699af97799c833be4d (diff) | |
| parent | 1835a6cbe8df59c3df94c9535179e999a2da88ca (diff) | |
| download | mediapointer-dvb-s2-bcb7869683912e8dca99bace426b7e080851354c.tar.gz mediapointer-dvb-s2-bcb7869683912e8dca99bace426b7e080851354c.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb
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/saa7146.h | 6 | ||||
| -rw-r--r-- | linux/include/media/v4l2-common.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/linux/include/media/saa7146.h b/linux/include/media/saa7146.h index 1904940e3..ffc67e4b8 100644 --- a/linux/include/media/saa7146.h +++ b/linux/include/media/saa7146.h @@ -130,7 +130,7 @@ struct saa7146_dev #endif unsigned char __iomem *mem; /* pointer to mapped IO memory */ - int revision; /* chip revision; needed for bug-workarounds*/ + u32 revision; /* chip revision; needed for bug-workarounds*/ /* pci-device & irq stuff*/ char name[32]; @@ -181,8 +181,8 @@ struct saa7146_format* format_by_fourcc(struct saa7146_dev *dev, int fourcc); int saa7146_pgtable_alloc(struct pci_dev *pci, struct saa7146_pgtable *pt); void saa7146_pgtable_free(struct pci_dev *pci, struct saa7146_pgtable *pt); int saa7146_pgtable_build_single(struct pci_dev *pci, struct saa7146_pgtable *pt, struct scatterlist *list, int length ); -char *saa7146_vmalloc_build_pgtable(struct pci_dev *pci, long length, struct saa7146_pgtable *pt); -void saa7146_vfree_destroy_pgtable(struct pci_dev *pci, char *mem, struct saa7146_pgtable *pt); +void *saa7146_vmalloc_build_pgtable(struct pci_dev *pci, long length, struct saa7146_pgtable *pt); +void saa7146_vfree_destroy_pgtable(struct pci_dev *pci, void *mem, struct saa7146_pgtable *pt); void saa7146_setgpio(struct saa7146_dev *dev, int port, u32 data); int saa7146_wait_for_debi_done(struct saa7146_dev *dev, int nobusyloop); diff --git a/linux/include/media/v4l2-common.h b/linux/include/media/v4l2-common.h index 579835f92..3f6e53f72 100644 --- a/linux/include/media/v4l2-common.h +++ b/linux/include/media/v4l2-common.h @@ -69,6 +69,9 @@ /* 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) \ |