[Xorg-commit] xc/programs/Xserver/hw/darwin darwin.c,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/Xserver/hw/darwin
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/hw/darwin

Modified Files:
      Tag: XORG-CURRENT
	darwin.c 
Log Message:
merge XFree86 4.3.99.901 (RC1) from vendor branch

Index: darwin.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/darwin/darwin.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- darwin.c	26 Nov 2003 22:48:43 -0000	1.1.4.1
+++ darwin.c	6 Dec 2003 13:24:23 -0000	1.1.4.2
@@ -29,7 +29,8 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.55 2003/11/15 00:07:09 torrey Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.56 2003/11/24 05:39:01 torrey Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
@@ -518,9 +519,7 @@
     darwinKeyboard = AddInputDevice(DarwinKeybdProc, TRUE);
     RegisterKeyboardDevice( darwinKeyboard );
 
-    if (serverGeneration == 1) {
-        DarwinEQInit( (DevicePtr)darwinKeyboard, (DevicePtr)darwinPointer );
-    }
+    DarwinEQInit( (DevicePtr)darwinKeyboard, (DevicePtr)darwinPointer );
 
     DarwinModeInitInput(argc, argv);
 }