diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-07 02:45:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-07 02:45:39 -0800 |
| commit | dcd9a62643335bdf300ebd6ade333f3c8b882e77 (patch) | |
| tree | 734a47d55e3842c9f6443ac029f09f3184456c49 /include | |
| parent | 21d3de02e3111b15b3f20e4ac9cd6af33cf68938 (diff) | |
| parent | 5c6b524308b64fdb2b16c02778a9e0f16b24190a (diff) | |
Merge bk://gkernel.bkbits.net/libata-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dvb/frontend.h | 2 | ||||
| -rw-r--r-- | include/media/saa7146.h | 2 | ||||
| -rw-r--r-- | include/media/saa7146_vv.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h index d0300dcff0af..585560022ba0 100644 --- a/include/linux/dvb/frontend.h +++ b/include/linux/dvb/frontend.h @@ -78,7 +78,7 @@ struct dvb_frontend_info { __u32 symbol_rate_min; __u32 symbol_rate_max; __u32 symbol_rate_tolerance; /* ppm */ - __u32 notifier_delay; /* ms */ + __u32 notifier_delay; /* DEPRECATED */ fe_caps_t caps; }; diff --git a/include/media/saa7146.h b/include/media/saa7146.h index 815964d52dd2..c02c923ecc6a 100644 --- a/include/media/saa7146.h +++ b/include/media/saa7146.h @@ -168,7 +168,7 @@ 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_setgpio(struct saa7146_dev *dev, int port, u32 data); -int saa7146_wait_for_debi_done(struct saa7146_dev *dev); +int saa7146_wait_for_debi_done(struct saa7146_dev *dev, int nobusyloop); /* some memory sizes */ #define SAA7146_I2C_MEM ( 1*PAGE_SIZE) diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h index 61a509eb1bc6..eddf16aa3e8e 100644 --- a/include/media/saa7146_vv.h +++ b/include/media/saa7146_vv.h @@ -219,8 +219,6 @@ extern struct saa7146_use_ops saa7146_vbi_uops; /* resource management functions */ int saa7146_res_get(struct saa7146_fh *fh, unsigned int bit); -int saa7146_res_check(struct saa7146_fh *fh, unsigned int bit); -int saa7146_res_locked(struct saa7146_dev *dev, unsigned int bit); void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits); #define RESOURCE_DMA1_HPS 0x1 |