| commit | 235c394d88d81b998f2eefe10d5ac055974eac8d | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Nov 20 23:18:34 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 20 23:18:34 2024 +0000 |
| tree | 8d22d75790b225bdbb3fb2c60603858780cbb2c4 | |
| parent | fffd5995f85f21fd7463673df6fb5999d07f991c [diff] | |
| parent | f99d75331da130cdb85ee8bcd880229ff743cfe6 [diff] |
Merge "platform.dts: Fix preprocessor bodging prop name" into main am: f99d75331d Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3367740 Change-Id: I2bbc63ce426cfa269bab0c19ac742d5cac72ed02 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