diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /include/linux/omap3isp.h | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
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 */ |