diff --git a/[refs] b/[refs] index db7fedcdc174..f41f4569e984 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f22926e06e1ab7aa5f5c532afa4591f3d9baf59c +refs/heads/master: 87920dd4d93924a4b4aba01078ab606406649a82 diff --git a/trunk/drivers/media/video/omap3isp/isppreview.h b/trunk/drivers/media/video/omap3isp/isppreview.h index 09686607973c..67723c7e07cf 100644 --- a/trunk/drivers/media/video/omap3isp/isppreview.h +++ b/trunk/drivers/media/video/omap3isp/isppreview.h @@ -66,8 +66,7 @@ #define PREV_CONTRAST (1 << 17) #define PREV_BRIGHTNESS (1 << 18) -#define PREV_AVERAGER (1 << 19) -#define PREV_FEATURES_END (1 << 20) +#define PREV_FEATURES_END (1 << 19) enum preview_input_entity { PREVIEW_INPUT_NONE,