diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-22 10:30:04 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-22 10:30:04 -0300 |
| commit | 4a78e983d25641804f5c0c83b6c10e51063b7872 (patch) | |
| tree | ce0631476907751234d1d60ee9d1f72e18b30de2 /linux/include/media | |
| parent | 2a03de082a1ec685712a48cedb06a73d5d607088 (diff) | |
| parent | 126b42f75f3d60cf024d206f8d7fb8680903cf8a (diff) | |
| download | mediapointer-dvb-s2-4a78e983d25641804f5c0c83b6c10e51063b7872.tar.gz mediapointer-dvb-s2-4a78e983d25641804f5c0c83b6c10e51063b7872.tar.bz2 | |
merge: http://linuxtv.org/hg/~aapot/m920x
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/ovcamchip.h | 1 | ||||
| -rw-r--r-- | linux/include/media/saa7146.h | 2 | ||||
| -rw-r--r-- | linux/include/media/saa7146_vv.h | 2 | ||||
| -rw-r--r-- | linux/include/media/tuner.h | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/linux/include/media/ovcamchip.h b/linux/include/media/ovcamchip.h index 9813334d6..9ac7da26e 100644 --- a/linux/include/media/ovcamchip.h +++ b/linux/include/media/ovcamchip.h @@ -17,7 +17,6 @@ #include "compat.h" #include <linux/videodev.h> #include <media/v4l2-common.h> -#include <linux/i2c.h> /* --------------------------------- */ /* ENUMERATIONS */ diff --git a/linux/include/media/saa7146.h b/linux/include/media/saa7146.h index ab0a60b4d..1904940e3 100644 --- a/linux/include/media/saa7146.h +++ b/linux/include/media/saa7146.h @@ -70,6 +70,7 @@ struct saa7146_pgtable { unsigned long offset; /* used for custom pagetables (used for example by budget dvb cards) */ struct scatterlist *slist; + int nents; }; struct saa7146_pci_extension_data { @@ -181,6 +182,7 @@ 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_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/saa7146_vv.h b/linux/include/media/saa7146_vv.h index 50e33b0e9..cce20ed5c 100644 --- a/linux/include/media/saa7146_vv.h +++ b/linux/include/media/saa7146_vv.h @@ -216,6 +216,8 @@ void saa7146_set_gpio(struct saa7146_dev *saa, u8 pin, u8 data); extern struct saa7146_use_ops saa7146_video_uops; int saa7146_start_preview(struct saa7146_fh *fh); int saa7146_stop_preview(struct saa7146_fh *fh); +int saa7146_video_do_ioctl(struct inode *inode, struct file *file, + unsigned int cmd, void *arg); /* from saa7146_vbi.c */ extern struct saa7146_use_ops saa7146_vbi_uops; diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index 27d2183a4..8e1e4738b 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -23,6 +23,7 @@ #define _TUNER_H #include <linux/videodev2.h> +#include <linux/i2c.h> #include <media/tuner-types.h> extern int tuner_debug; |