From owner-p4-projects@FreeBSD.ORG  Sun Dec 14 15:10:56 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E8F681065676; Sun, 14 Dec 2008 15:10:55 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ACD101065672
	for <perforce@freebsd.org>; Sun, 14 Dec 2008 15:10:55 +0000 (UTC)
	(envelope-from zec@icir.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9BE6D8FC13
	for <perforce@freebsd.org>; Sun, 14 Dec 2008 15:10:55 +0000 (UTC)
	(envelope-from zec@icir.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBEFAt5F063059
	for <perforce@freebsd.org>; Sun, 14 Dec 2008 15:10:55 GMT
	(envelope-from zec@icir.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBEFAtgu063057
	for perforce@freebsd.org; Sun, 14 Dec 2008 15:10:55 GMT
	(envelope-from zec@icir.org)
Date: Sun, 14 Dec 2008 15:10:55 GMT
Message-Id: <200812141510.mBEFAtgu063057@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@icir.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 154646 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Dec 2008 15:10:56 -0000

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

Change 154646 by zec@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 */