diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-16 09:08:43 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-16 09:08:43 -0300 |
| commit | b63a5d079a4470d956a235506f7b242ae4105707 (patch) | |
| tree | a8ead825b00315c157b7bdb2c201399019e477a4 /linux/include | |
| parent | 61c970e0a13a189f9ef4d9ed6a4003c2ef71d041 (diff) | |
| parent | aff94781d4209955056c852f6220829e4a9a26a3 (diff) | |
| download | mediapointer-dvb-s2-b63a5d079a4470d956a235506f7b242ae4105707.tar.gz mediapointer-dvb-s2-b63a5d079a4470d956a235506f7b242ae4105707.tar.bz2 | |
merge: http://linuxtv.org/hg/~endriss/v4l-dvb
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/saa7146.h | 6 |
1 files changed, 3 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); |