Update.

	Renamed from si_flags due to conflict with si_flags from <elf.h>.

1 files changed, 1 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 6fd8932010..1f1d967ccd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2004-09-29  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/ia64/bits/siginfo.h (si_segvflags):
-	Renamed from si_flags due to comflict with si_flags from <elf.h>.
+	Renamed from si_flags due to conflict with si_flags from <elf.h>.
 
 2004-09-28  Ulrich Drepper  <drepper@redhat.com>