[xsrc/trunk]: xsrc/external/mit/xorg-server/dist/hw/xfree86/common fix merge ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/e836ad93635a
branches:  trunk
changeset: 7101:e836ad93635a
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jul 15 04:10:41 2022 +0000

description:
fix merge botch.

diffstat:

 external/mit/xorg-server/dist/hw/xfree86/common/compiler.h |  1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diffs (11 lines):

diff -r 8cb3a979174a -r e836ad93635a external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
--- a/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h        Fri Jul 15 02:18:56 2022 +0000
+++ b/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h        Fri Jul 15 04:10:41 2022 +0000
@@ -519,7 +519,6 @@
 }
 
 #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 */