PERFORCE change 57613 for review

[Scott Long]

http://perforce.freebsd.org/chv.cgi?CH=57613

Change 57613 by scottl at scottl-junior on 2004/07/18 07:31:03

	Teach if_ndis about the ndisapi->ntoskern rename.

Affected files ...

.. //depot/projects/sonofevil/src/sys/dev/if_ndis/if_ndis.c#2 edit
.. //depot/projects/sonofevil/src/sys/dev/if_ndis/if_ndis_pccard.c#2 edit
.. //depot/projects/sonofevil/src/sys/dev/if_ndis/if_ndis_pci.c#2 edit

Differences ...

==== //depot/projects/sonofevil/src/sys/dev/if_ndis/if_ndis.c#2 (text+ko) ====

@@ -71,12 +71,12 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-#include <compat/ndis/pe_var.h>
-#include <compat/ndis/resource_var.h>
-#include <compat/ndis/hal_var.h>
-#include <compat/ndis/ntoskrnl_var.h>
-#include <compat/ndis/ndis_var.h>
-#include <compat/ndis/cfg_var.h>
+#include <compat/ntoskern/pe_var.h>
+#include <compat/ntoskern/resource_var.h>
+#include <compat/ntoskern/hal_var.h>
+#include <compat/ntoskern/ntoskrnl_var.h>
+#include <compat/ntoskern/ndis_var.h>
+#include <compat/ntoskern/cfg_var.h>
 #include <dev/if_ndis/if_ndisvar.h>
 
 #define NDIS_IMAGE

==== //depot/projects/sonofevil/src/sys/dev/if_ndis/if_ndis_pccard.c#2 (text+ko) ====

@@ -53,11 +53,11 @@
 
 #include <net80211/ieee80211_var.h>
 
-#include <compat/ndis/pe_var.h>
-#include <compat/ndis/resource_var.h>
-#include <compat/ndis/ntoskrnl_var.h>
-#include <compat/ndis/ndis_var.h>
-#include <compat/ndis/cfg_var.h>
+#include <compat/ntoskern/pe_var.h>
+#include <compat/ntoskern/resource_var.h>
+#include <compat/ntoskern/ntoskrnl_var.h>
+#include <compat/ntoskern/ndis_var.h>
+#include <compat/ntoskern/cfg_var.h>
 #include <dev/if_ndis/if_ndisvar.h>
 
 #include <dev/pccard/pccardvar.h>
@@ -70,7 +70,7 @@
 MODULE_DEPEND(ndis, pccard, 1, 1, 1);
 MODULE_DEPEND(ndis, ether, 1, 1, 1);
 MODULE_DEPEND(ndis, wlan, 1, 1, 1);
-MODULE_DEPEND(ndis, ndisapi, 1, 1, 1);
+MODULE_DEPEND(ndis, ntoskern, 1, 1, 1);
 
 /*
  * Various supported device vendors/types and their names.

==== //depot/projects/sonofevil/src/sys/dev/if_ndis/if_ndis_pci.c#2 (text+ko) ====

@@ -55,11 +55,11 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-#include <compat/ndis/pe_var.h>
-#include <compat/ndis/resource_var.h>
-#include <compat/ndis/ntoskrnl_var.h>
-#include <compat/ndis/ndis_var.h>
-#include <compat/ndis/cfg_var.h>
+#include <compat/ntoskern/pe_var.h>
+#include <compat/ntoskern/resource_var.h>
+#include <compat/ntoskern/ntoskrnl_var.h>
+#include <compat/ntoskern/ndis_var.h>
+#include <compat/ntoskern/cfg_var.h>
 #include <dev/if_ndis/if_ndisvar.h>
 
 #include "ndis_driver_data.h"
@@ -69,7 +69,7 @@
 MODULE_DEPEND(ndis, pci, 1, 1, 1);
 MODULE_DEPEND(ndis, ether, 1, 1, 1);
 MODULE_DEPEND(ndis, wlan, 1, 1, 1);
-MODULE_DEPEND(ndis, ndisapi, 1, 1, 1);
+MODULE_DEPEND(ndis, ntoskern, 1, 1, 1);
 
 /*
  * Various supported device vendors/types and their names.