aboutsummaryrefslogtreecommitdiff
path: root/linaro
diff options
context:
space:
mode:
Diffstat (limited to 'linaro')
-rw-r--r--linaro/configs/arndale_octa.conf6
-rw-r--r--linaro/configs/mali-arndale-octa.conf5
2 files changed, 6 insertions, 5 deletions
diff --git a/linaro/configs/arndale_octa.conf b/linaro/configs/arndale_octa.conf
index 7be71b95e84..dd627d84f0d 100644
--- a/linaro/configs/arndale_octa.conf
+++ b/linaro/configs/arndale_octa.conf
@@ -35,9 +35,9 @@ CONFIG_CPU_THERMAL=y
CONFIG_EXYNOS_THERMAL=y
CONFIG_EXYNOS_THERMAL_CORE=y
CONFIG_MFD_SEC_CORE=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_S2MPS11=y
+#CONFIG_REGULATOR=y
+#CONFIG_REGULATOR_FIXED_VOLTAGE=y
+#CONFIG_REGULATOR_S2MPS11=y
CONFIG_DRM=y
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_EXYNOS=y
diff --git a/linaro/configs/mali-arndale-octa.conf b/linaro/configs/mali-arndale-octa.conf
index bce9e3b4646..6e1dc3d4b5a 100644
--- a/linaro/configs/mali-arndale-octa.conf
+++ b/linaro/configs/mali-arndale-octa.conf
@@ -1,6 +1,7 @@
-CONFIG_MALI_T6XX=y
+#CONFIG_MALI_T6XX=y
+CONFIG_MALI_MIDGARD=y
CONFIG_MALI_EXPERT=y
CONFIG_MALI_PLATFORM_FAKE=y
CONFIG_MALI_PLATFORM_THIRDPARTY=y
-CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="arndale"
+CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="arndale_octa"