diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-12 03:36:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-12 03:36:18 -0400 |
| commit | 9cb5baba5e3acba0994ad899ee908799104c9965 (patch) | |
| tree | d5ff16000256a0bf56279926e6114b4603ede2b4 /drivers/media/video/omap3isp/isppreview.c | |
| parent | 7142d17e8f935fa842e9f6eece2281b6d41625d6 (diff) | |
| parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
Merge commit 'v2.6.39-rc7' into sched/core
Diffstat (limited to 'drivers/media/video/omap3isp/isppreview.c')
| -rw-r--r-- | drivers/media/video/omap3isp/isppreview.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/omap3isp/isppreview.c b/drivers/media/video/omap3isp/isppreview.c index 2b16988a501d..aba537af87e4 100644 --- a/drivers/media/video/omap3isp/isppreview.c +++ b/drivers/media/video/omap3isp/isppreview.c | |||
| @@ -755,7 +755,7 @@ static struct preview_update update_attrs[] = { | |||
| 755 | * @configs - pointer to update config structure. | 755 | * @configs - pointer to update config structure. |
| 756 | * @config - return pointer to appropriate structure field. | 756 | * @config - return pointer to appropriate structure field. |
| 757 | * @bit - for which feature to return pointers. | 757 | * @bit - for which feature to return pointers. |
| 758 | * Return size of coresponding prev_params member | 758 | * Return size of corresponding prev_params member |
| 759 | */ | 759 | */ |
| 760 | static u32 | 760 | static u32 |
| 761 | __preview_get_ptrs(struct prev_params *params, void **param, | 761 | __preview_get_ptrs(struct prev_params *params, void **param, |