[ros-diffs] [tkreuzer] 41036: fix merge artifact

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Fri May 22 00:36:53 2009
New Revision: 41036

URL: http://svn.reactos.org/svn/reactos?rev=41036&view=rev
Log:
fix merge artifact

Modified:
    branches/ros-amd64-bringup/reactos/drivers/network/ndis/include/ndissys.h

Modified: branches/ros-amd64-bringup/reactos/drivers/network/ndis/include/ndissys.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drivers/network/ndis/include/ndissys.h?rev=41036&r1=41035&r2=41036&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] Fri May 22 00:36:53 2009
@@ -511,7 +511,6 @@
 VOID
 NTAPI
 ExGetCurrentProcessorCounts(
-  PULONG ThreadKernelTime,
    PULONG ThreadKernelTime,
    PULONG TotalCpuTime,
    PULONG ProcessorNumber);