compile with fewer CONFIG_ symbols

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_drv.c

diff --git a/arch/arm/mach-exynos/include/mach/sysmmu.h b/arch/arm/mach-exynos/include/mach/sysmmu.h
index d42589d3ae1433af27167c32e434a5acffbb471b..395199da2a0c97e1f022819d1f02ffbe5328067d 100644 (file)
--- a/arch/arm/mach-exynos/include/mach/sysmmu.h
+++ b/arch/arm/mach-exynos/include/mach/sysmmu.h
@@ -28,7 +28,11 @@ struct sysmmu_platform_data {
 static inline void platform_set_sysmmu(
                struct device *sysmmu, struct device *dev)
 {
+#ifndef CONFIG_EXYNOS_IOMMU
+       printk("DEBUG %s %d, %d %d\n", __func__, __LINE__, sysmmu->id, dev->id);
+#else
        dev->archdata.iommu = sysmmu;
+#endif
 }
 
 #ifdef CONFIG_EXYNOS_IOMMU

diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index 300d01d72ca6015d593fc71eed3e10f0d93d2f28..3ff1e6ae261f066d0bbcc26eab30a14457488060 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -30,6 +30,7 @@
 #include "drm_crtc_helper.h"
 
 #include <drm/exynos_drm.h>
+#include <linux/pm_runtime.h>
 
 #include "exynos_drm_drv.h"
 #include "exynos_drm_crtc.h"
@@ -607,7 +608,9 @@ out_mixer:
 out_hdmi:
 #endif
 
+#ifdef CONFIG_DRM_EXYNOS_DP
        platform_driver_unregister(&dp_driver);
+#endif
 out_dp_driver:
 #ifdef CONFIG_DRM_EXYNOS_FIMD
        platform_driver_unregister(&fimd_driver);
@@ -641,7 +644,9 @@ static void __exit exynos_drm_exit(void)
        platform_driver_unregister(&vidi_driver);
 #endif
 
+#ifdef CONFIG_DRM_EXYNOS_DP
        platform_driver_unregister(&dp_driver);
+#endif
 #ifdef CONFIG_DRM_EXYNOS_FIMD
        platform_driver_unregister(&fimd_driver);
 #endif