| commit | 4eaef78df1d240a4c007614d04d8fa64e678b632 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Nov 20 23:41:02 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 20 23:41:02 2024 +0000 |
| tree | 884f00183efa99432dbe8565e2cd149152726274 | |
| parent | 56d47506f1c3ece9f67ac177b113f4b2b91fa31e [diff] | |
| parent | 235c394d88d81b998f2eefe10d5ac055974eac8d [diff] |
Merge "platform.dts: Fix preprocessor bodging prop name" into main am: f99d75331d am: 235c394d88 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3367740 Change-Id: Idea2db8fd3c266f9983df63adfb8e7acf84e0768 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/guest/pvmfw/platform.dts b/guest/pvmfw/platform.dts index 44834ed..c3ecd0e 100644 --- a/guest/pvmfw/platform.dts +++ b/guest/pvmfw/platform.dts
@@ -4,6 +4,11 @@ #include <dt-bindings/interrupt-controller/arm-gic.h> +// Undefine macros conflicting with our definitions. +#ifdef linux +#undef linux +#endif + #define PLACEHOLDER 0xffffffff #define PLACEHOLDER2 PLACEHOLDER PLACEHOLDER #define PLACEHOLDER4 PLACEHOLDER2 PLACEHOLDER2