rk fb: fix complie error when CONFIG_ROCKCHIP_IOMMU is not set
authorzwl <zwl@rockchips.com>
Sun, 21 Sep 2014 02:29:05 +0000 (10:29 +0800)
committerzwl <zwl@rockchips.com>
Sun, 21 Sep 2014 02:29:05 +0000 (10:29 +0800)
drivers/video/rockchip/rk_fb.c

index adfeb5690be71468c636a53c900eb8798cb91c67..5d5ae6d9a55b3e23bbfab06c4796d99806242afa 100755 (executable)
@@ -2445,8 +2445,11 @@ static int rk_fb_ioctl(struct fb_info *info, unsigned int cmd,
                u32 hwc_phy[1];
                if (copy_from_user(hwc_phy, argp, 4))
                        return -EFAULT;
+#ifdef CONFIG_ROCKCHIP_IOMMU
                if (!dev_drv->iommu_enabled) {
+#endif
                        fix->smem_start = hwc_phy[0];
+#ifdef CONFIG_ROCKCHIP_IOMMU
                } else {
                        int usr_fd;
                        struct ion_handle *hdl;
@@ -2483,6 +2486,7 @@ static int rk_fb_ioctl(struct fb_info *info, unsigned int cmd,
                        fix->smem_start = phy_addr;
                        ion_hwc[0] = hdl;
                }
+#endif
                break;
        }
        case RK_FBIOSET_YUV_ADDR: