===========================================================================
Index: linux/fs/xfs/Makefile
===========================================================================

--- /usr/tmp/TmpDir.30278-0/linux/fs/xfs/Makefile_1.139	Fri May 31 10:08:51 2002
+++ linux/fs/xfs/Makefile	Fri May 31 10:03:58 2002
@@ -137,8 +137,7 @@
 				   xfs_utils.o \
 				   xfs_vfsops.o \
 				   xfs_vnodeops.o \
-				   xfs_rw.o \
-				   xfs_log_lsn.o
+				   xfs_rw.o
 
 # Objects not built in this directory
 obj-y				+= pagebuf/pagebuf.o \

===========================================================================
Index: linux/fs/xfs/xfs_log.h
===========================================================================

--- /usr/tmp/TmpDir.30278-0/linux/fs/xfs/xfs_log.h_1.59	Fri May 31 10:08:51 2002
+++ linux/fs/xfs/xfs_log.h	Fri May 31 10:05:02 2002
@@ -48,16 +48,16 @@
 #define CYCLE_LSN_NOCONV(lsn,arch) (((uint *)&(lsn))[LSN_FIELD_CYCLE(arch)])
 
 #ifdef __KERNEL__
-#if (__GNUC__ == 2) && (__GNUC_MINOR__ == 95) 
-extern xfs_lsn_t _lsn_cmp(xfs_lsn_t, xfs_lsn_t, xfs_arch_t);
-#define _lsn_cmp _xfs_lsn_cmp
-#endif
-
 /*
- * By comparing each component, we don't have to worry about extra
+ * By comparing each compnent, we don't have to worry about extra
  * endian issues in treating two 32 bit numbers as one 64 bit number
  */
-static inline
+static
+#ifdef __GNUC__
+# if !((__GNUC__ == 2) && (__GNUC_MINOR__ == 95))
+__inline__
+#endif
+#endif
 xfs_lsn_t	_lsn_cmp(xfs_lsn_t lsn1, xfs_lsn_t lsn2, xfs_arch_t arch)
 {
 	if (CYCLE_LSN(lsn1, arch) != CYCLE_LSN(lsn2, arch))