PERFORCE change 154646 for review

[Marko Zec]

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

Change 154646 by zec at zec_tpx32 on 2008/12/14 15:10:44

	Partial resolving of misintegrations.

Affected files ...

.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_desc.h#3 edit
.. //depot/projects/vimage/src/sys/kern/kern_linker.c#23 edit
.. //depot/projects/vimage/src/sys/net/if_var.h#24 edit

Differences ...

==== //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_desc.h#3 (text+ko) ====

@@ -22,10 +22,6 @@
 
 #include "opt_ah.h"		/* NB: required for AH_SUPPORT_AR5416 */
 
-#ifndef AH_SUPPORT_AR5416
-#define AH_SUPPORT_AR5416
-#endif
-
 /*
  * Transmit descriptor status.  This structure is filled
  * in only after the tx descriptor process method finds a

==== //depot/projects/vimage/src/sys/kern/kern_linker.c#23 (text+ko) ====

@@ -1321,7 +1321,7 @@
 				break;
 			}
 		}
-#ifdef VIMAGE
+#ifndef VIMAGE_GLOBALS
 		/*
 		 * If the symbol is not found in global namespace,
 		 * try to look it up in the current vimage namespace.

==== //depot/projects/vimage/src/sys/net/if_var.h#24 (text+ko) ====

@@ -665,7 +665,6 @@
 struct ifaddr	*ifaddr_byindex(u_short idx);
 struct cdev	*ifdev_byindex(u_short idx);
 
-extern	int ifqmaxlen;
 #ifdef VIMAGE_GLOBALS
 extern	struct ifnethead ifnet;
 extern	struct ifnet *loif;	/* first loopback interface */