diff options
| author | Arvind Chauhan <arvind.chauhan@arm.com> | 2018-05-08 04:57:54 +0100 |
|---|---|---|
| committer | Arvind Chauhan <arvind.chauhan@arm.com> | 2018-05-08 04:57:54 +0100 |
| commit | 6a99adffa37b6bb0b0b22c0df998356b4981f72c (patch) | |
| tree | 9d6b6e033bcf0581263137d105597ffc878eef8e | |
| parent | b2679547788fb5321aca7eadfad245988ab13c98 (diff) | |
configs: vexpress64: Fix typoack-4.9-armlt-20180509ack-4.9-armlt-18.04
Signed-off-by: Arvind Chauhan <arvind.chauhan@arm.com>
| -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 |