From 05f0203060035bd2cb8c8f98b8b466b934b1c45b Mon Sep 17 00:00:00 2001 From: Daniel Hillenbrand Date: Sat, 25 May 2013 10:53:54 +0200 Subject: u1: import from CyanogenMod/android_kernel_samsung_smdk4210 Change-Id: I9629a4060538c9c4c6a43a86a56826cd7123d1b5 --- drivers/media/video/samsung/fimc/fimc_dev_u1.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'drivers/media/video/samsung/fimc/fimc_dev_u1.c') diff --git a/drivers/media/video/samsung/fimc/fimc_dev_u1.c b/drivers/media/video/samsung/fimc/fimc_dev_u1.c index 762256b..811ac96 100644 --- a/drivers/media/video/samsung/fimc/fimc_dev_u1.c +++ b/drivers/media/video/samsung/fimc/fimc_dev_u1.c @@ -575,9 +575,6 @@ struct fimc_control *fimc_register_controller(struct platform_device *pdev) ctrl->power_status = FIMC_POWER_OFF; /* CMA */ -#ifdef CONFIG_ION_EXYNOS - if (id != 2) { -#endif sprintf(ctrl->cma_name, "%s%d", FIMC_CMA_NAME, ctrl->id); err = cma_info(&mem_info, ctrl->dev, 0); fimc_info1("%s : [cma_info] start_addr : 0x%x, end_addr : 0x%x, " @@ -593,9 +590,6 @@ struct fimc_control *fimc_register_controller(struct platform_device *pdev) ctrl->mem.base = (dma_addr_t)cma_alloc (ctrl->dev, ctrl->cma_name, (size_t)ctrl->mem.size, 0); } -#ifdef CONFIG_ION_EXYNOS - } -#endif printk(KERN_INFO "ctrl->mem.size = 0x%x\n", ctrl->mem.size); printk(KERN_INFO "ctrl->mem.base = 0x%x\n", ctrl->mem.base); -- cgit v1.1