From e4322d512d3e1f25cb459f8406194639510bb3d2 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 6 Apr 2012 16:49:17 +0800 Subject: [PATCH] camera rk30 : use ion mem for default. --- arch/arm/configs/rk30_sdk_defconfig | 1 + arch/arm/plat-rk/rk_camera.c | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) mode change 100755 => 100644 arch/arm/configs/rk30_sdk_defconfig diff --git a/arch/arm/configs/rk30_sdk_defconfig b/arch/arm/configs/rk30_sdk_defconfig old mode 100755 new mode 100644 index a96a07340f4f..7dfdf86da574 --- a/arch/arm/configs/rk30_sdk_defconfig +++ b/arch/arm/configs/rk30_sdk_defconfig @@ -265,6 +265,7 @@ CONFIG_SOC_CAMERA=y CONFIG_SOC_CAMERA_OV2659=y CONFIG_SOC_CAMERA_OV5642=y CONFIG_VIDEO_RK29=y +CONFIG_VIDEO_RK29_CAMMEM_ION=y CONFIG_ION=y CONFIG_ION_ROCKCHIP=y CONFIG_FB=y diff --git a/arch/arm/plat-rk/rk_camera.c b/arch/arm/plat-rk/rk_camera.c index a7991b790e82..b5addd65e60c 100755 --- a/arch/arm/plat-rk/rk_camera.c +++ b/arch/arm/plat-rk/rk_camera.c @@ -251,14 +251,8 @@ #ifdef CONFIG_VIDEO_RK29_CAMMEM_ION - #ifdef CONFIG_ARCH_RK29 #undef PMEM_CAM_NECESSARY #define PMEM_CAM_NECESSARY 0x00000000 - #endif -#else - #ifdef CONFIG_ARCH_RK30 -// #error "Camera driver memory configuration is alloc from pmem, but ARCH_RK30 isn't support" - #endif #endif -- 2.34.1