commit f99d75331da130cdb85ee8bcd880229ff743cfe6
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Nov 20 23:01:18 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 20 23:01:18 2024 +0000
tree 802675edb2f00288a7f1a2f583b4aefbd2d7a275
parent 442abf9bb947a47d416d55858c2b863e0217c99d
parent 57acb56909b4e2c99f7cb96879c35a4b0347e4b6

Merge "platform.dts: Fix preprocessor bodging prop name" into main

guest/pvmfw/platform.dts

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