diff options
| author | Colin Cross <ccross@android.com> | 2011-01-07 17:14:48 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-01-07 17:14:48 -0800 |
| commit | bd842b53fada517017d192c8a12fc9a38e6250e1 (patch) | |
| tree | 57399eb06aba47199535f8a5d42023465eb5001f /include/media | |
| parent | 5a5f348ffc433c0483b5c13ebefe73adb5e68f2b (diff) | |
| parent | d77cf23f1befd3922d81b91cb01fd3da619e0206 (diff) | |
Merge commit 'v2.6.36.3' into linux-tegra-2.6.36
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/saa7146.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/saa7146.h b/include/media/saa7146.h index 7a9f76ecbbbd..ac7ce00f39cf 100644 --- a/include/media/saa7146.h +++ b/include/media/saa7146.h @@ -161,7 +161,7 @@ extern struct list_head saa7146_devices; extern struct mutex saa7146_devices_lock; int saa7146_register_extension(struct saa7146_extension*); int saa7146_unregister_extension(struct saa7146_extension*); -struct saa7146_format* format_by_fourcc(struct saa7146_dev *dev, int fourcc); +struct saa7146_format* saa7146_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 ); |