diff options
author | Michal Marek <mmarek@suse.cz> | 2010-10-27 22:15:57 (GMT) |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-10-27 22:15:57 (GMT) |
commit | b74b953b998bcc2db91b694446f3a2619ec32de6 (patch) | |
tree | 6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /include/media/davinci/vpfe_capture.h | |
parent | abb438526201c6a79949ad45375c051b6681c253 (diff) | |
parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
download | linux-fsl-qoriq-b74b953b998bcc2db91b694446f3a2619ec32de6.tar.xz |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
Diffstat (limited to 'include/media/davinci/vpfe_capture.h')
-rw-r--r-- | include/media/davinci/vpfe_capture.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/media/davinci/vpfe_capture.h b/include/media/davinci/vpfe_capture.h index d863e5e..cc973ed 100644 --- a/include/media/davinci/vpfe_capture.h +++ b/include/media/davinci/vpfe_capture.h @@ -94,6 +94,8 @@ struct vpfe_config { /* vpfe clock */ struct clk *vpssclk; struct clk *slaveclk; + /* Function for Clearing the interrupt */ + void (*clr_intr)(int vdint); }; struct vpfe_device { @@ -165,7 +167,7 @@ struct vpfe_device { u8 started; /* * offset where second field starts from the starting of the - * buffer for field seperated YCbCr formats + * buffer for field separated YCbCr formats */ u32 field_off; }; |