diff --git a/Xi/extinit.c b/Xi/extinit.c
index d8714ba7c..595e3582f 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -610,16 +610,6 @@ SDevicePropertyNotifyEvent (devicePropertyNotify *from, devicePropertyNotify *to
     swapl(&to->atom, n);
 }
 
-static void
-SDeviceEnterNotifyEvent (deviceEnterNotify *from, deviceEnterNotify *to)
-{
-    char n;
-
-    *to = *from;
-    swaps(&to->sequenceNumber,n);
-    swapl(&to->time, n);
-}
-
 static void
 SDeviceLeaveNotifyEvent (deviceLeaveNotify *from, deviceLeaveNotify *to)
 {
@@ -1102,7 +1092,7 @@ SEventIDispatch(xEvent * from, xEvent * to)
     else if (type == DevicePropertyNotify)
 	DO_SWAP(SDevicePropertyNotifyEvent, devicePropertyNotify);
     else if (type == DeviceEnterNotify)
-        DO_SWAP(SDeviceEnterNotifyEvent, deviceEnterNotify);
+        DO_SWAP(SDeviceLeaveNotifyEvent, deviceEnterNotify);
     else if (type == DeviceLeaveNotify)
         DO_SWAP(SDeviceLeaveNotifyEvent, deviceLeaveNotify);
     else {