diff options
-rw-r--r-- | linaro/configs/vexpress64.conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf index 8ceaf7f1f633..e5fba9d8c982 100644 --- a/linaro/configs/vexpress64.conf +++ b/linaro/configs/vexpress64.conf @@ -86,7 +86,6 @@ CONFIG_ARM_TIMER_SP804=y CONFIG_ARM_CPUIDLE=y CONFIG_PM_DEBUG=y CONFIG_PM_RUNTIME=y -<<<<<<< 77e347a9710bc21c27dd3b2fc151be9dad471ee2 CONFIG_TEE=y CONFIG_OPTEE=y CONFIG_DEVMEM=y |