From owner-p4-projects@FreeBSD.ORG  Thu Oct 12 08:33:01 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F3F7716A4B3; Thu, 12 Oct 2006 08:33:00 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B5D1C16A49E
	for <perforce@FreeBSD.org>; Thu, 12 Oct 2006 08:33:00 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8074743D46
	for <perforce@FreeBSD.org>; Thu, 12 Oct 2006 08:33:00 +0000 (GMT)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C8X0wf085433
	for <perforce@FreeBSD.org>; Thu, 12 Oct 2006 08:33:00 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C8X0JX085422
	for perforce@freebsd.org; Thu, 12 Oct 2006 08:33:00 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 12 Oct 2006 08:33:00 GMT
Message-Id: <200610120833.k9C8X0JX085422@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 107748 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: Thu, 12 Oct 2006 08:33:01 -0000

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

Change 107748 by hselasky@hselasky_mini_itx on 2006/10/12 08:32:37

	Compile fixes for FreeBSD 6.x

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/if_ural.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/ucom.c#12 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#15 (text+ko) ====

@@ -942,7 +942,9 @@
 	ic->ic_reset = &ural_reset_cb;
 
 	/* enable SW bmiss handling in sta mode */
+#if (defined(IEEE80211_FEXT_SWBMISS) || (__FreeBSD_version >= 700022))
 	ic->ic_flags_ext |= IEEE80211_FEXT_SWBMISS;
+#endif
 
 	/* override state transition machine */
 	sc->sc_newstate = ic->ic_newstate;

==== //depot/projects/usb/src/sys/dev/usb/ucom.c#12 (text+ko) ====

@@ -323,7 +323,7 @@
 
 	DPRINTF(0, "tp = %p, unit = %d\n", tp, sc->sc_unit);
 
-#ifndef TS_CALLOUT
+#if !(defined(TS_CALLOUT) || (__FreeBSD_version >= 700022))
 #define TS_CALLOUT NULL, sc->sc_unit, MINOR_CALLOUT /* compile fix for FreeBSD 6.x */
 #endif
 	error = ttycreate(tp, TS_CALLOUT, "U%d", sc->sc_unit);