diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-03-04 23:40:47 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-03-04 23:40:47 +0300 |
| commit | 4359cc219b0ae5315804247bda0f49d7f840549b (patch) | |
| tree | d8bdaf09a5666b60776d6dab4e3c4e57ee2ab9f7 /linaro | |
| parent | 9bc5c82bd0f87101c4690f745f39ef3ae91fbc4e (diff) | |
| parent | a032fd0356faa766c75d25f8bf2d70c0fedc2de0 (diff) | |
Merge remote-tracking branch 'configs/config-boards-tracking' into config-tracking
Diffstat (limited to 'linaro')
| -rw-r--r-- | linaro/configs/arndale.conf | 2 | ||||
| -rw-r--r-- | linaro/configs/arndale_octa.conf | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/linaro/configs/arndale.conf b/linaro/configs/arndale.conf index b832473d90e3..6d6f6de3024f 100644 --- a/linaro/configs/arndale.conf +++ b/linaro/configs/arndale.conf @@ -51,7 +51,6 @@ CONFIG_REGULATOR_S5M8767=y CONFIG_DRM=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_EXYNOS=y -# CONFIG_DRM_EXYNOS_IOMMU is not set CONFIG_DRM_EXYNOS_DMABUF=y CONFIG_DRM_EXYNOS_HDMI=y CONFIG_FRAMEBUFFER_CONSOLE=y @@ -82,7 +81,6 @@ CONFIG_MMC_DW_IDMAC=y CONFIG_MMC_DW_EXYNOS=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_S3C=y -CONFIG_EXYNOS_IOMMU=y CONFIG_PHY_EXYNOS5250_SATA=y CONFIG_PHY_SAMSUNG_USB2=y CONFIG_PHY_EXYNOS4210_USB2=y diff --git a/linaro/configs/arndale_octa.conf b/linaro/configs/arndale_octa.conf index 2bb86b8aede2..b8c42a665ff4 100644 --- a/linaro/configs/arndale_octa.conf +++ b/linaro/configs/arndale_octa.conf @@ -42,7 +42,6 @@ CONFIG_REGULATOR_S2MPS11=y CONFIG_DRM=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_EXYNOS=y -CONFIG_DRM_EXYNOS_IOMMU=y CONFIG_DRM_EXYNOS_DMABUF=y CONFIG_DRM_EXYNOS_HDMI=y CONFIG_FRAMEBUFFER_CONSOLE=y @@ -72,8 +71,6 @@ CONFIG_MMC_DW_IDMAC=y CONFIG_MMC_DW_EXYNOS=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_S3C=y -CONFIG_EXYNOS_IOMMU=y -CONFIG_EXYNOS_IOMMU_DEBUG=y CONFIG_EXTCON=y CONFIG_PHY_SAMSUNG_USB2=y CONFIG_PHY_EXYNOS4210_USB2=y |