diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /include/linux/omap3isp.h | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'include/linux/omap3isp.h')
| -rw-r--r-- | include/linux/omap3isp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/omap3isp.h b/include/linux/omap3isp.h index 150822b4dbff..b6111f8cd49a 100644 --- a/include/linux/omap3isp.h +++ b/include/linux/omap3isp.h | |||
| @@ -250,7 +250,7 @@ enum omap3isp_h3a_af_rgbpos { | |||
| 250 | /* Contains the information regarding the Horizontal Median Filter */ | 250 | /* Contains the information regarding the Horizontal Median Filter */ |
| 251 | struct omap3isp_h3a_af_hmf { | 251 | struct omap3isp_h3a_af_hmf { |
| 252 | __u8 enable; /* Status of Horizontal Median Filter */ | 252 | __u8 enable; /* Status of Horizontal Median Filter */ |
| 253 | __u8 threshold; /* Threshhold Value for Horizontal Median Filter */ | 253 | __u8 threshold; /* Threshold Value for Horizontal Median Filter */ |
| 254 | }; | 254 | }; |
| 255 | 255 | ||
| 256 | /* Contains the information regarding the IIR Filters */ | 256 | /* Contains the information regarding the IIR Filters */ |