From a067e0e45157d63647179182c0254b0e3868e801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Voltz?= <stef.dev@free.fr>
Date: Thu, 22 Nov 2001 05:15:00 +0000
Subject: [PATCH] 	* added an entry about umax_pp backend compile fix

---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 7414fe7e1..a9c102bda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-22  Stéphane Voltz  <svoltz@wanadoo.fr>
+
+	* backend/umax_pp_low.c: fixed build problem on non i386 linux when
+	  there is no <sys/io.h>.
+
 2001-11-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
 	* TODO: Added entries about the fork/kill(-1,...) issue, the inb/outb
@@ -49,6 +54,7 @@
 
 2001-11-10  Stéphane Voltz  <svoltz@wanadoo.fr>
 
+>>>>>>> 1.539
 	* backend/umax_pp_low.c: correct PPC compile problem by removing
 	  buggy extra ifdef