[xserver-commit] xserver/hw/xizzle/os-support/linux Makefile.am,3.5,3.6 lnx_io.c,3.28,3.29

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver/hw/xizzle/os-support/linux
In directory pdx:/tmp/cvs-serv1952/os-support/linux

Modified Files:
	Makefile.am lnx_io.c 
Log Message:
Link errors: and then there was one.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/os-support/linux/Makefile.am,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -d -r3.5 -r3.6
--- a/Makefile.am	10 Mar 2004 11:50:33 -0000	3.5
+++ b/Makefile.am	10 Mar 2004 12:39:41 -0000	3.6
@@ -11,7 +11,8 @@
                            ../shared/bios_mmap.c ../shared/VTsw_usl.c \
                            ../shared/std_kbdEv.c ../shared/posix_tty.c \
                            ../shared/vidmem.c ../shared/sigio.c \
-                           ../shared/stdResource.c
+                           ../shared/stdResource.c lnxResource.c \
+                           ../../common/xf86PM.c
 libxizzlelinux_a_LIBADD = int10/libxizzlelinuxint10.a \
                           $(DRI_LIBS)
 

Index: lnx_io.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/os-support/linux/lnx_io.c,v
retrieving revision 3.28
retrieving revision 3.29
diff -u -d -r3.28 -r3.29
--- a/lnx_io.c	28 Feb 2004 01:27:55 -0000	3.28
+++ b/lnx_io.c	10 Mar 2004 12:39:41 -0000	3.29
@@ -183,8 +183,10 @@
   if(KIOCSRATE_ioctl_ok(rate, delay))	/* sparc? */
     return;
 
+#if 0
   if (xf86IsPc98())
     return;
+#endif
 
 #if defined(__alpha__) || defined (__i386__) || defined(__ia64__)