diff options
| author | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-05-25 10:53:54 +0200 |
|---|---|---|
| committer | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-05-25 10:53:54 +0200 |
| commit | 05f0203060035bd2cb8c8f98b8b466b934b1c45b (patch) | |
| tree | 051a8c9d1a431b27fb5d4fecaf5417487857a400 /drivers/media/video/samsung/fimc/fimc_dev_u1.c | |
| parent | ab6dfccd8d126b50059d39d031cfa1ddc8f32b84 (diff) | |
| download | kernel_samsung_smdk4412-05f0203060035bd2cb8c8f98b8b466b934b1c45b.zip kernel_samsung_smdk4412-05f0203060035bd2cb8c8f98b8b466b934b1c45b.tar.gz kernel_samsung_smdk4412-05f0203060035bd2cb8c8f98b8b466b934b1c45b.tar.bz2 | |
u1: import from CyanogenMod/android_kernel_samsung_smdk4210
Change-Id: I9629a4060538c9c4c6a43a86a56826cd7123d1b5
Diffstat (limited to 'drivers/media/video/samsung/fimc/fimc_dev_u1.c')
| -rw-r--r-- | drivers/media/video/samsung/fimc/fimc_dev_u1.c | 6 |
1 files changed, 0 insertions, 6 deletions
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); |