summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--hw/xfree86/os-support/bsd/Makefile.am3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e908213d2..01cd7d588 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-30 Matthieu Herrb <matthieu.herrb@laas.fr>
+
+ * hw/xfree86/os-support/bsd/Makefile.am:
+ Powerpc machines also need ioperm_noop.c
+
2006-05-30 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/doc/man/xorg.conf.man.pre:
diff --git a/hw/xfree86/os-support/bsd/Makefile.am b/hw/xfree86/os-support/bsd/Makefile.am
index d65b3852d..ae89a6bf6 100644
--- a/hw/xfree86/os-support/bsd/Makefile.am
+++ b/hw/xfree86/os-support/bsd/Makefile.am
@@ -38,7 +38,8 @@ ARCH_SOURCES = i386_video.c
endif
if PPC_VIDEO
-ARCH_SOURCES = ppc_video.c
+ARCH_SOURCES = ppc_video.c \
+ $(srcdir)/../shared/ioperm_noop.c
endif
if SPARC64_VIDEO