Module Name: xsrc
Committed By: mrg
Date: Fri Jul 15 04:10:41 UTC 2022
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h
Log Message:
fix merge botch.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.19 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.20
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.19 Fri Jul 15 02:18:59 2022
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h Fri Jul 15 04:10:41 2022
@@ -519,7 +519,6 @@ xf86WriteMmio32Le(__volatile__ void *bas
}
#elif defined(__mips__) || ((defined(__arm__) || defined(__arm32__)) && !defined(__linux__))
-#if defined(__arm__) || defined(__arm32__) || defined(__mips64)
#define PORT_SIZE long
extern _X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
