diff -r f5ec9446e5bf -r e8773a61782d camerauis/cameraapp/generic/src/CamCaptureSetupControlHandler.cpp
--- a/camerauis/cameraapp/generic/src/CamCaptureSetupControlHandler.cpp	Mon Jan 18 20:06:55 2010 +0200
+++ b/camerauis/cameraapp/generic/src/CamCaptureSetupControlHandler.cpp	Tue Jan 26 11:44:00 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -110,16 +110,13 @@
 				CleanupStack::Pop( captureSetupControl );
                 if( iSettingType == ECamSettingItemDynamicPhotoColourFilter ||
                     iSettingType == ECamSettingItemDynamicPhotoWhiteBalance ||
-                    iSettingType == ECamSettingItemDynamicPhotoFlash ||
                     iSettingType == ECamSettingItemDynamicPhotoImageSharpness || 
 
                     iSettingType == ECamSettingItemDynamicVideoColourFilter ||
                     iSettingType == ECamSettingItemDynamicVideoWhiteBalance || 
-                    iSettingType == ECamSettingItemDynamicVideoFlash ||
                     iSettingType == ECamSettingItemDynamicVideoBrightness ||
 
                     iSettingType == ECamSettingItemUserSceneImageSharpness ||
-                    iSettingType == ECamSettingItemUserSceneFlash ||
                     iSettingType == ECamSettingItemUserSceneWhitebalance ||
                     iSettingType == ECamSettingItemUserSceneColourFilter )
                     {